Changeset 97288 in vbox for trunk/src/VBox/ValidationKit/tests/unittests

Timestamp:

Oct 25, 2022 7:13:52 AM (2 years ago)

Author:

vboxsync

Message:

ValidationKit/tests/unittests/tdUnitTest1.py: Skip checking for black list / buggy tests list etc. when executing with --only-whitelist. This allows a unit test being black listed AND white listed at the same time, so that it only gets executed when --only-whitelist is being used (but skipped on the rest). Handy for unit tests which require a full-blown OS (e.g. a guest VM) instead of a (test) box which only has minimal dependencies.

Added testcase/tstClipboardMockHGCM, so that it only executes remotely (nested) on the guest VMS for the reasons above.

File:

• trunk/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py

@@ -133 +133 @@
         'testcase/tstClipboardX11Smoke': '',            # (Old naming, deprecated) Needs X, not available on all test boxes.
         'testcase/tstClipboardGH-X11Smoke': '',         # (New name) Ditto.
+        'testcase/tstClipboardMockHGCM': '',            # Ditto.
         'tstClipboardQt': '',                           # Is interactive and needs Qt, needed for Qt clipboard bugfixing.
         'testcase/tstClipboardQt': '',                  # In case it moves here.
@@ -258 +259 @@
     # White list, which contains tests considered to be safe to execute,
     # even on remote targets (guests).
+    #
+    # When --only-whitelist is specified, this is the only list being checked for.
     kdTestCasesWhiteList = {
         'testcase/tstFile': '',
         'testcase/tstFileLock': '',
+        'testcase/tstClipboardMockHGCM': '',            # Requires X on Linux OSes. Execute on remote targets only (guests).
         'testcase/tstRTLocalIpc': '',
         'testcase/tstRTPathQueryInfo': '',
@@ -1192 +1196 @@
             if  self.fOnlyWhiteList \
             and not self._isExcluded(sName, self.kdTestCasesWhiteList):
+                # (No testStart/Done or accounting here!)
                 reporter.log('%s: SKIPPED (not in white list)' % (sName,));
                 continue;
@@ -1201 +1206 @@
                 continue;
 
-            # Check if the testcase is black listed or buggy before executing it.
-            if self._isExcluded(sName, self.kdTestCasesBlackList):
-                # (No testStart/Done or accounting here!)
-                reporter.log('%s: SKIPPED (blacklisted)' % (sName,));
-
-            elif self._isExcluded(sName, self.kdTestCasesBuggy):
-                reporter.testStart(sName);
-                reporter.log('%s: Skipping, buggy in general.' % (sName,));
-                reporter.testDone(fSkipped = True);
-                self.cSkipped += 1;
-
-            elif self._isExcluded(sName, dTestCasesBuggyForHostOs):
-                reporter.testStart(sName);
-                reporter.log('%s: Skipping, buggy on %s.' % (sName, utils.getHostOs(),));
-                reporter.testDone(fSkipped = True);
-                self.cSkipped += 1;
-
+            # When not only processing the white list, do some more checking first.
+            if not self.fOnlyWhiteList:
+                # Check if the testcase is black listed or buggy before executing it.
+                if self._isExcluded(sName, self.kdTestCasesBlackList):
+                    # (No testStart/Done or accounting here!)
+                    reporter.log('%s: SKIPPED (blacklisted)' % (sName,));
+                    continue;
+
+                elif self._isExcluded(sName, self.kdTestCasesBuggy):
+                    reporter.testStart(sName);
+                    reporter.log('%s: Skipping, buggy in general.' % (sName,));
+                    reporter.testDone(fSkipped = True);
+                    self.cSkipped += 1;
+                    continue;
+
+                elif self._isExcluded(sName, dTestCasesBuggyForHostOs):
+                    reporter.testStart(sName);
+                    reporter.log('%s: Skipping, buggy on %s.' % (sName, utils.getHostOs(),));
+                    reporter.testDone(fSkipped = True);
+                    self.cSkipped += 1;
+                    continue;
             else:
-                sFullPath = os.path.normpath(os.path.join(self.sUnitTestsPathSrc, os.path.join(sTestCaseSubDir, sFilename)));
-                reporter.testStart(sName);
-                try:
-                    fSkipped = self._executeTestCase(oTestVm, sName, sFullPath, sTestCaseSubDir, oDevNull);
-                except:
-                    reporter.errorXcpt('!*!');
-                    self.cFailed += 1;
-                    fSkipped = False;
-                reporter.testDone(fSkipped);
-
+                # Passed the white list check already above.
+                pass;
+
+            sFullPath = os.path.normpath(os.path.join(self.sUnitTestsPathSrc, os.path.join(sTestCaseSubDir, sFilename)));
+            reporter.testStart(sName);
+            try:
+                fSkipped = self._executeTestCase(oTestVm, sName, sFullPath, sTestCaseSubDir, oDevNull);
+            except:
+                reporter.errorXcpt('!*!');
+                self.cFailed += 1;
+                fSkipped = False;
+            reporter.testDone(fSkipped);