Changeset 79602 in vbox for trunk/src/VBox/ValidationKit/tests/storage

Timestamp:

Jul 8, 2019 5:00:21 PM (5 years ago)

Author:

vboxsync

Message:

ValidationKit/tdStorageBenchmark1: Testcase fixes for Windows

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (1 diff)
• storagecfg.py (modified) (4 diffs)
• tdStorageBenchmark1.py (modified) (1 diff)

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

@@ -284 +284 @@
             fRc = self.oTxsSession.syncRmTree(sDir, cMsTimeout);
         else:
-            fRc = self.execBinaryNoStdOut('rm', ('-rf', sDir));
-
-        return fRc;
-
+            try:
+                shutil.rmtree(sDir, ignore_errors=True);
+            except:
+                fRc = False;
+
+        return fRc;
+

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

@@ -461 +461 @@
         elif oDiskCfg.getTargetOs() == 'linux':
             oStorOs = StorageConfigOsLinux(); # pylint: disable=redefined-variable-type
-        elif not oDiskCfg.isCfgStaticDir(): # For unknown hosts we only a static testing directory we don't care about setting up.
+        elif not oDiskCfg.isCfgStaticDir(): # For unknown hosts we only allow a static testing directory we don't care about setting up.
             fRc = False;
 
@@ -472 +472 @@
                 for sDisk in oDiskCfg.getDisks():
                     self.lstDisks.append(StorageDisk(sDisk));
+            elif oDiskCfg.isCfgStaticDir():
+                if not os.path.exists(oDiskCfg.getDisks()):
+                        self.oExec.mkDir(oDiskCfg.getDisks(), 0o700);
 
     def __del__(self):
         self.cleanup();
+        self.oDiskCfg = None;
 
     def cleanup(self):
@@ -492 +496 @@
         self.dVols.clear();
         self.dPools.clear();
-        self.oDiskCfg = None;
         self.iPoolId  = 0;
         self.iVolId   = 0;
@@ -654 +657 @@
 
         fRc = True;
-        for sEntry in os.listdir(self.oDiskCfg.getDisks()):
-            fRc = fRc and self.oExec.rmTree(os.path.join(self.oDiskCfg.getDisks(), sEntry));
-
-        return fRc;
+        if os.path.exists(self.oDiskCfg.getDisks()):
+            for sEntry in os.listdir(self.oDiskCfg.getDisks()):
+                fRc = fRc and self.oExec.rmTree(os.path.join(self.oDiskCfg.getDisks(), sEntry));
+
+        return fRc;

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

@@ -395 +395 @@
     # Global storage configs for the testbox
     kdStorageCfgs = {
+        # Testbox configs
         'testboxstor1.de.oracle.com': storagecfg.DiskCfg('solaris', storagecfg.g_ksDiskCfgRegExp, r'c[3-9]t\dd0\Z'),
-        'testboxstor2.de.oracle.com': storagecfg.DiskCfg('win',     storagecfg.g_ksDiskCfgStatic, 'D:'),
+        'testboxstor2.de.oracle.com': storagecfg.DiskCfg('win',     storagecfg.g_ksDiskCfgStatic, 'D:\\StorageTest'),
+
+        # Local test configs for the testcase developer
         'adaris':                     storagecfg.DiskCfg('linux',   storagecfg.g_ksDiskCfgList,   [ '/dev/sda' ]),
         'daedalus':                   storagecfg.DiskCfg('darwin',  storagecfg.g_ksDiskCfgStatic, \
-                                                         '/Volumes/VirtualBox/Testsuite/StorageScratch')
+                                                         '/Volumes/VirtualBox/Testsuite/StorageScratch'),
+        'windows10':                  storagecfg.DiskCfg('win',  storagecfg.g_ksDiskCfgStatic, \
+                                                         'L:\\Testsuite\\StorageTest'),
     };