Changeset 83764 in vbox

Timestamp:

Apr 17, 2020 3:23:51 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/Guest Additions: Skip following sub tests / modules if installing Guest Additions failed; no point in wasting testing time.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py

@@ -170 +170 @@
             reporter.testDone(fSkip);
 
-            fSkip = 'guestprops' not in self.asTests;
-            reporter.testStart('Guest Properties');
-            if not fSkip:
-                fRc = self.testGuestProperties(oSession, oTxsSession, oTestVm) and fRc;
-            reporter.testDone(fSkip);
-
-            fSkip = 'guestcontrol' not in self.asTests;
-            reporter.testStart('Guest Control');
-            if not fSkip:
-                fRc, oTxsSession = self.aoSubTstDrvs[0].testIt(oTestVm, oSession, oTxsSession);
-            reporter.testDone(fSkip);
-
-            fSkip = 'sharedfolders' not in self.asTests and self.fpApiVer >= 6.0;
-            reporter.testStart('Shared Folders');
-            if not fSkip:
-                fRc, oTxsSession = self.aoSubTstDrvs[1].testIt(oTestVm, oSession, oTxsSession);
-            reporter.testDone(fSkip or fRc is None);
+            if  not fSkip \
+            and not fRc:
+                reporter.log('Skipping following tests as Guest Additions were not installed successfully');
+            else:
+                fSkip = 'guestprops' not in self.asTests;
+                reporter.testStart('Guest Properties');
+                if not fSkip:
+                    fRc = self.testGuestProperties(oSession, oTxsSession, oTestVm) and fRc;
+                reporter.testDone(fSkip);
+
+                fSkip = 'guestcontrol' not in self.asTests;
+                reporter.testStart('Guest Control');
+                if not fSkip:
+                    fRc, oTxsSession = self.aoSubTstDrvs[0].testIt(oTestVm, oSession, oTxsSession);
+                reporter.testDone(fSkip);
+
+                fSkip = 'sharedfolders' not in self.asTests and self.fpApiVer >= 6.0;
+                reporter.testStart('Shared Folders');
+                if not fSkip:
+                    fRc, oTxsSession = self.aoSubTstDrvs[1].testIt(oTestVm, oSession, oTxsSession);
+                reporter.testDone(fSkip or fRc is None);
 
             ## @todo Save and restore test.