vbox的更動 62197 路徑 trunk/src/VBox/ValidationKit

時間撮記:

2016-7-12 下午01:37:55 (8 年 以前)

作者:

vboxsync

訊息:

ValidationKit/storage: Hack to work around changes in block device naming during bootup (sometimes sda is the test disk and sdb the root volume)

檔案:

• trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py (修改) (2 筆差異)

trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py

@@ -426 +426 @@
         return oStorCfg.cleanup();
 
+    def getGuestDisk(self, oSession, oTxsSession, eStorageController):
+        """
+        Gets the path of the disk in the guest to use for testing.
+        """
+        lstDisks = None;
+
+        # The naming scheme for NVMe is different and we don't have
+        # to query the guest for unformatted disks here because the disk with the OS
+        # is not attached to a NVMe controller.
+        if eStorageController == vboxcon.StorageControllerType_NVMe:
+            lstDisks = [ '/dev/nvme0n1' ];
+        else:
+            # Find a unformatted disk (no partition).
+            # @todo: This is a hack because LIST and STAT are not yet implemented
+            #        in TXS (get to this eventually)
+            lstBlkDev = [ '/dev/sda', '/dev/sdb' ];
+            for sBlkDev in lstBlkDev:
+                fRc = oTxsSession.syncExec('/usr/bin/ls', ('ls', sBlkDev + '1'));
+                if not fRc:
+                    lstDisks = [ sBlkDev ];
+                    break;
+
+        _ = oSession;
+        return lstDisks;
+
     def testBenchmark(self, sTargetOs, sBenchmark, sMountpoint, oExecutor):
         """
@@ -548 +573 @@
                 lstBinaryPaths = ['/bin', '/sbin', '/usr/bin', '/usr/sbin' ];
                 oExecVm = remoteexecutor.RemoteExecutor(oTxsSession, lstBinaryPaths, '${SCRATCH}');
-                lstDisks = [ '/dev/sdb' ];
-                # The naming scheme for NVMe is different.
-                if eStorageController == vboxcon.StorageControllerType_NVMe:
-                    lstDisks = [ '/dev/nvme0n1' ];
-                oStorCfgVm = storagecfg.StorageCfg(oExecVm, 'linux', lstDisks);
+                oStorCfgVm = storagecfg.StorageCfg(oExecVm, 'linux', self.getGuestDisk(oSession, oTxsSession, \
+                                                                                       eStorageController));
 
                 sMountPoint = self.prepareStorage(oStorCfgVm);