Changeset 103336 in vbox for trunk/src

Timestamp:

Feb 13, 2024 2:05:35 PM (12 months ago)

Author:

vboxsync

Message:

Validation Kit/tdStorageBenchmark: Fail more gracefully if storage volume preparation failed.

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• storagecfg.py (modified) (1 diff)
• tdStorageBenchmark1.py (modified) (3 diffs)

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

@@ -664 +664 @@
         """
         Creates a new directory on the volume pointed to by the given mount point.
-        """
-        return self.oExec.mkDir(sMountPoint + '/' + sDir, fMode);
+
+        Returns success status.
+        """
+        return self.oExec.mkDir(os.path.join(sMountPoint, sDir), fMode);
 
     def cleanupLeftovers(self):

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

@@ -837 +837 @@
         """
         Prepares the host storage for disk images or direct testing on the host.
+
+        Will return the created mount point path on success, or None on failure.
         """
         # Create a basic pool with the default configuration.
@@ -847 +849 @@
                 oStorCfg.cleanup();
 
+        if not fRc:
+            reporter.error('Failed to prepare host storage (fRamDisk=%s, cbPool=%d)' % (fRamDisk, cbPool,));
         return sMountPoint;
 
@@ -1449 +1453 @@
                     reporter.testStart('Create host storage');
                     sMountPoint = self.prepareStorage(self.oStorCfg);
-                    if sMountPoint is None:
-                        reporter.testFailure('Failed to prepare host storage');
+                    if sMountPoint:
+                        fMode = 0o777;
+                        sDir  = os.path.join(sMountPoint, 'test');
+                        if self.oStorCfg.mkDirOnVolume(sMountPoint, 'test', fMode):
+                            sMountPoint = sDir;
+                        else:
+                            reporter.error('Creating volume directory "%s" (mode %x) failed' % (sDir, fMode,));
+                    else:
                         fRc = False;
-                    self.oStorCfg.mkDirOnVolume(sMountPoint, 'test', 0o777);
-                    sMountPoint = sMountPoint + '/test';
                     reporter.testDone();