Changeset 103806 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Mar 12, 2024 12:16:04 PM (12 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162175

Message:

ValKit, storage test fix, cleanup function can remove files now as well, host storage test stage checks if directory exists

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

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

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

@@ -309 +309 @@
         else:
             try:
-                reporter.log("rmTree (%s) using shutil.rmtree function" % sDir);
-                shutil.rmtree(sDir);
+                if os.path.isfile(sDir):
+                    reporter.log("deleting file: %s" % sDir)
+                    os.remove(sDir)
+                else:
+                    reporter.log("rmTree (%s) using shutil.rmtree function" % sDir);
+                    shutil.rmtree(sDir);
             except:
                 fRc = False;

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

@@ -224 +224 @@
         if lstPools is not None:
             for sPool in lstPools:
+                fRc2 = fRc3 = False  # flags for volumes and pools destruction results
                 lstVolumes = self._getActiveVolumesInPoolStartingWith(oExec, sPool, sVolIdStart);
                 reporter.log('lstVolumes: %s' % lstVolumes)
@@ -231 +232 @@
                     for sVolume in lstVolumes:
                         fRc2 = oExec.execBinary('zfs', ('destroy', sVolume));
-                        if not fRc2:
-                            fRc = fRc2
                     reporter.log('destroying volumes ends');
 
-                    # Destroy the pool
-                    reporter.log('destroying pools starts');
-                    fRc2 = self.destroyPool(oExec, sPool);
-                    reporter.log('destroying pools ends');
-                    if not fRc2:
-                        fRc = fRc2;
-                else:
+                # Destroy the pool
+                reporter.log('destroying pools starts');
+                fRc3 = self.destroyPool(oExec, sPool);
+                reporter.log('destroying pools ends');
+                if not (fRc2 or fRc3):
                     fRc = False;
         else:

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

@@ -1456 +1456 @@
                         fMode = 0o777;
                         sDir  = os.path.join(sMountPoint, 'test');
-                        if self.oStorCfg.mkDirOnVolume(sMountPoint, 'test', fMode):
-                            sMountPoint = sDir;
+                        if os.path.exists(sDir) or self.oStorCfg.mkDirOnVolume(sMountPoint, 'test', fMode):
+                            sMountPoint = sDir
                         else:
                             reporter.error('Creating volume directory "%s" (mode %x) failed' % (sDir, fMode,));