Changeset 80244 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Aug 13, 2019 8:37:08 AM (5 years ago)

Author:

vboxsync

Message:

ValidationKit/tdStoragebenchmark1: Fixes for the newly integrated IoPerf test which trips the test manager because the sub test nesting gets too deep

File:

• trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py (modified) (16 diffs)

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

@@ -78 +78 @@
     def prepare(self, cMsTimeout = 30000):
         """ Prepares the testcase """
+        reporter.testStart('Fio');
 
         sTargetOs = self.dCfg.get('TargetOs', 'linux');
@@ -118 +119 @@
     def run(self, cMsTimeout = 30000):
         """ Runs the testcase """
-        _ = cMsTimeout
         fRc, sOutput, sError = self.oExecutor.execBinary('fio', (self.sCfgFileId,), cMsTimeout = cMsTimeout);
         if fRc:
@@ -132 +132 @@
     def cleanup(self):
         """ Cleans up any leftovers from the testcase. """
+        reporter.testDone();
+        return True;
 
     def reportResult(self):
@@ -178 +180 @@
     def prepare(self, cMsTimeout = 30000):
         """ Prepares the testcase """
-        _ = cMsTimeout;
+        reporter.testStart('IoZone');
         return True; # Nothing to do.
 
@@ -196 +198 @@
                            '\nError:\n\n' +
                            sError);
-
-        _ = cMsTimeout;
         return fRc;
 
     def cleanup(self):
         """ Cleans up any leftovers from the testcase. """
+        reporter.testDone();
         return True;
 
@@ -332 +333 @@
     def __init__(self, aasTestLvls, aasTestsBlacklist, fnIsCfgSupported = None):
         self.aasTestsBlacklist = aasTestsBlacklist;
-        self.at3TestLvls       = [];
+        self.at4TestLvls       = [];
         self.iTestLvl          = 0;
         self.fnIsCfgSupported  = fnIsCfgSupported;
         for asTestLvl in aasTestLvls:
             if isinstance(asTestLvl, tuple):
-                asTestLvl, fnTestFmt = asTestLvl;
-                self.at3TestLvls.append((0, fnTestFmt, asTestLvl));
+                asTestLvl, fSubTestStartAuto, fnTestFmt = asTestLvl;
+                self.at4TestLvls.append((0, fSubTestStartAuto, fnTestFmt, asTestLvl));
             else:
-                self.at3TestLvls.append((0, None, asTestLvl));
-
-        self.at3TestLvls.reverse();
+                self.at4TestLvls.append((0, True, None, asTestLvl));
+
+        self.at4TestLvls.reverse();
 
         # Get the first non blacklisted test.
@@ -351 +352 @@
         iLvl = 0;
         for sCfg in asTestCfg:
-            reporter.testStart('%s' % (self.getTestIdString(sCfg, iLvl)));
+            sSubTest = self.getTestIdString(sCfg, iLvl);
+            if sSubTest is not None:
+                reporter.testStart('%s' % (sSubTest,));
             iLvl += 1;
 
     def __del__(self):
         # Make sure the tests are marked as done.
-        while self.iTestLvl < len(self.at3TestLvls):
+        while self.iTestLvl < len(self.at4TestLvls):
             reporter.testDone();
             self.iTestLvl += 1;
@@ -367 +370 @@
         # The order of the test levels is reversed so get the level starting
         # from the end.
-        _, fnTestFmt, _ = self.at3TestLvls[len(self.at3TestLvls) - 1 - iLvl];
+        _, fSubTestStartAuto, fnTestFmt, _ = self.at4TestLvls[len(self.at4TestLvls) - 1 - iLvl];
+        if not fSubTestStartAuto:
+            return None;
         if fnTestFmt is not None:
             return fnTestFmt(oCfg);
@@ -398 +403 @@
         array of strings or an empty config if there is no test left anymore.
         """
-        iTestCfg, fnTestFmt, asTestCfg = self.at3TestLvls[self.iTestLvl];
+        iTestCfg, fSubTestStartAuto, fnTestFmt, asTestCfg = self.at4TestLvls[self.iTestLvl];
         iTestCfg += 1;
-        self.at3TestLvls[self.iTestLvl] = (iTestCfg, fnTestFmt, asTestCfg);
-        while iTestCfg == len(asTestCfg) and self.iTestLvl < len(self.at3TestLvls):
-            self.at3TestLvls[self.iTestLvl] = (0, fnTestFmt, asTestCfg);
+        self.at4TestLvls[self.iTestLvl] = (iTestCfg, fSubTestStartAuto, fnTestFmt, asTestCfg);
+        while iTestCfg == len(asTestCfg) and self.iTestLvl < len(self.at4TestLvls):
+            self.at4TestLvls[self.iTestLvl] = (0, fSubTestStartAuto, fnTestFmt, asTestCfg);
             self.iTestLvl += 1;
-            if self.iTestLvl < len(self.at3TestLvls):
-                iTestCfg, fnTestFmt, asTestCfg = self.at3TestLvls[self.iTestLvl];
+            if self.iTestLvl < len(self.at4TestLvls):
+                iTestCfg, fSubTestStartAuto, fnTestFmt, asTestCfg = self.at4TestLvls[self.iTestLvl];
                 iTestCfg += 1;
-                self.at3TestLvls[self.iTestLvl] = (iTestCfg, fnTestFmt, asTestCfg);
+                self.at4TestLvls[self.iTestLvl] = (iTestCfg, fSubTestStartAuto, fnTestFmt, asTestCfg);
                 if iTestCfg < len(asTestCfg):
                     self.iTestLvl = 0;
@@ -422 +427 @@
         asTestCfg = [];
 
-        if self.iTestLvl < len(self.at3TestLvls):
-            for t3TestLvl in self.at3TestLvls:
-                iTestCfg, _, asTestLvl = t3TestLvl;
+        if self.iTestLvl < len(self.at4TestLvls):
+            for t4TestLvl in self.at4TestLvls:
+                iTestCfg, _, _, asTestLvl = t4TestLvl;
                 asTestCfg.append(asTestLvl[iTestCfg]);
 
@@ -444 +449 @@
         # Compare the current and next config and close the approriate test
         # categories.
-        reporter.testDone(fSkippedLast);
+        #reporter.testDone(fSkippedLast);
         if asTestCfg:
             idxSame = 0;
@@ -454 +459 @@
 
             for i in range(idxSame, len(asTestCfg)):
-                reporter.testStart('%s' % (self.getTestIdString(asTestCfg[i], i)));
+                sSubTest = self.getTestIdString(asTestCfg[i], i);
+                if sSubTest is not None:
+                    reporter.testStart('%s' % (sSubTest,));
 
         else:
@@ -541 +548 @@
     kiCpuCount    = 5;
     kiVirtMode    = 6;
-    kiIoTest      = 7;
-    kiTestSet     = 8;
+    kiTestSet     = 7;
+    kiIoTest      = 8;
 
     def __init__(self):
@@ -1346 +1353 @@
         aasTestCfgs.insert(self.kiVmName,      self.asTestVMs);
         aasTestCfgs.insert(self.kiStorageCtrl, self.asStorageCtrls);
-        aasTestCfgs.insert(self.kiHostIoCache, (self.asHostIoCache, self.fnFormatHostIoCache));
+        aasTestCfgs.insert(self.kiHostIoCache, (self.asHostIoCache, True, self.fnFormatHostIoCache));
         aasTestCfgs.insert(self.kiDiskFmt,     self.asDiskFormats);
         aasTestCfgs.insert(self.kiDiskVar,     self.asDiskVariants);
-        aasTestCfgs.insert(self.kiCpuCount,    (self.acCpus, self.fnFormatCpuString));
-        aasTestCfgs.insert(self.kiVirtMode,    (self.asVirtModes, self.fnFormatVirtMode));
-        aasTestCfgs.insert(self.kiIoTest,      self.asTests);
+        aasTestCfgs.insert(self.kiCpuCount,    (self.acCpus, True, self.fnFormatCpuString));
+        aasTestCfgs.insert(self.kiVirtMode,    (self.asVirtModes, True, self.fnFormatVirtMode));
         aasTestCfgs.insert(self.kiTestSet,     self.asTestSets);
+        aasTestCfgs.insert(self.kiIoTest,      (self.asTests, False, None));
 
         aasTestsBlacklist = [];
@@ -1404 +1411 @@
                 if sMountPoint is not None:
                     for sIoTest in self.asTests:
-                        reporter.testStart(sIoTest);
                         for sTestSet in self.asTestSets:
                             reporter.testStart(sTestSet);
@@ -1410 +1416 @@
                             self.testBenchmark(utils.getHostOs(), sIoTest, sMountPoint, oExecutor, dTestSet);
                             reporter.testDone();
-                        reporter.testDone();
                     self.cleanupStorage(self.oStorCfg);
                 else: