Changeset 83774 in vbox

Timestamp:

Apr 17, 2020 5:56:52 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: More work on checking task results; txsRunTest() now has an optional attribute fCheckSessionStatus to avoid having to check that status in the calling code. Also, the overall test result of such a particular test then would indicate success/failure better in the log.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vbox.py (modified) (3 diffs)
• tests/additions/tdAddBasic1.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -3720 +3720 @@
     # pylint: disable=too-many-locals,too-many-arguments
 
-    def txsRunTest(self, oTxsSession, sTestName, cMsTimeout, sExecName, asArgs = (), asAddEnv = (), sAsUser = ""):
+    def txsRunTest(self, oTxsSession, sTestName, cMsTimeout, sExecName, asArgs = (), asAddEnv = (), sAsUser = "",
+                   fCheckSessionStatus = False):
         """
         Executes the specified test task, waiting till it completes or times out.
@@ -3731 +3732 @@
         Returns False if some unexpected task was signalled or we failed to
         submit the job.
+
+        If fCheckSessionStatus is set to True, the overall session status will be
+        taken into account and logged as an error on failure.
         """
         reporter.testStart(sTestName);
@@ -3744 +3748 @@
                 oTask = self.waitForTasks(cMsTimeout + 1);
                 if oTask is None:
-                    reporter.log('txsRunTest: waitForTasks timed out');
+                    if fCheckSessionStatus:
+                        reporter.error('txsRunTest: waitForTasks for test "%s" timed out' % (sTestName,));
+                    else:
+                        reporter.log('txsRunTest: waitForTasks for test "%s" timed out' % (sTestName,));
                     break;
                 if oTask is oTxsSession:
-                    fRc = True;
-                    reporter.log('txsRunTest: isSuccess=%s getResult=%s' % (oTxsSession.isSuccess(), oTxsSession.getResult()));
+                    if      fCheckSessionStatus \
+                    and not oTxsSession.isSuccess():
+                        reporter.error('txsRunTest: Test "%s" failed' % (sTestName,));
+                    else:
+                        fRc = True;
+                        reporter.log('txsRunTest: isSuccess=%s getResult=%s' \
+                                     % (oTxsSession.isSuccess(), oTxsSession.getResult()));
                     break;
                 if not self.handleTask(oTask, 'txsRunTest'):

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

@@ -259 +259 @@
         if oTestVm.sKind not in ('WindowsNT4', 'Windows2000', 'WindowsXP', 'Windows2003'):
             fRc = self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000, '${CDROM}/cert/VBoxCertUtil.exe',
-                                  ('${CDROM}/cert/VBoxCertUtil.exe', 'add-trusted-publisher', '${CDROM}/cert/vbox-sha1.cer'));
-            if not fRc \
-            or oTxsSession.getResult() is False:
+                                  ('${CDROM}/cert/VBoxCertUtil.exe', 'add-trusted-publisher', '${CDROM}/cert/vbox-sha1.cer'),
+                                  fCheckSessionStatus = True);
+            if not fRc:
                 reporter.error('Error installing SHA1 certificate');
             else:
                 fRc = self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000, '${CDROM}/cert/VBoxCertUtil.exe',
                                       ('${CDROM}/cert/VBoxCertUtil.exe', 'add-trusted-publisher',
-                                       '${CDROM}/cert/vbox-sha256.cer'));
-                if not fRc \
-                or oTxsSession.getResult() is False:
+                                       '${CDROM}/cert/vbox-sha256.cer'), fCheckSessionStatus = True);
+                if not fRc:
                     reporter.error('Error installing SHA256 certificate');
 
@@ -291 +290 @@
                                                   ('c:\\Windows\\System32\\reg.exe', 'add',
                                                    '"HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Setup"',
-                                                   '/v', 'LogLevel', '/t', 'REG_DWORD', '/d', '0xFF'));
+                                                   '/v', 'LogLevel', '/t', 'REG_DWORD', '/d', '0xFF'),
+                                                   fCheckSessionStatus = True);
 
         for sFile in asLogFiles:
@@ -302 +302 @@
         #
         fRc = self.txsRunTest(oTxsSession, 'VBoxWindowsAdditions.exe', 5 * 60 * 1000, '${CDROM}/VBoxWindowsAdditions.exe',
-                              ('${CDROM}/VBoxWindowsAdditions.exe', '/S', '/l', '/with_autologon'));
+                              ('${CDROM}/VBoxWindowsAdditions.exe', '/S', '/l', '/with_autologon'), fCheckSessionStatus = True);
 
         #
@@ -344 +344 @@
         or oTestVm.sKind.startswith('Ubuntu'):
             fRc = self.txsRunTest(oTxsSession, 'Installing Kernel headers', 5 * 60 *1000,
-                                  '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'linux-headers-generic'));
-            if not fRc \
-            or oTxsSession.getResult() is False:
+                                  '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'linux-headers-generic'),
+                                  fCheckSessionStatus = True);
+            if not fRc:
                 reporter.error('Error installing Kernel headers');
             fRc = self.txsRunTest(oTxsSession, 'Installing Guest Additions depdendencies', 5 * 60 *1000, \
-                                  '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'build-essential', 'perl'));
-            if not fRc \
-            or oTxsSession.getResult() is False:
+                                  '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'build-essential', 'perl'),
+                                  fCheckSessionStatus = True);
+            if not fRc:
                 reporter.error('Error installing additional installer dependencies');
         elif oTestVm.sKind.startswith('OL') \
@@ -359 +359 @@
         or   oTestVm.sKind.startswith('Cent'):
             fRc = self.txsRunTest(oTxsSession, 'Installing Kernel headers', 5 * 60 *1000,
-                                  '/usr/bin/yum', ('/usr/bin/yum', '-y', 'install', 'kernel-headers'));
-            if not fRc \
-            or oTxsSession.getResult() is False:
+                                  '/usr/bin/yum', ('/usr/bin/yum', '-y', 'install', 'kernel-headers'),
+                                  fCheckSessionStatus = True);
+            if not fRc:
                 reporter.error('Error installing Kernel headers');
             fRc = self.txsRunTest(oTxsSession, 'Installing Guest Additions depdendencies', 5 * 60 *1000, \
                                   '/usr/bin/yum', ('/usr/bin/yum', '-y', 'install', \
-                                                   'make', 'automake', 'gcc', 'kernel-devel', 'dkms', 'bzip2', 'perl'));
-            if not fRc \
-            or oTxsSession.getResult() is False:
+                                                   'make', 'automake', 'gcc', 'kernel-devel', 'dkms', 'bzip2', 'perl'),
+                                  fCheckSessionStatus = True);
+            if not fRc:
                 reporter.error('Error installing additional installer dependencies');
         else:
@@ -379 +379 @@
             #
             fRc = self.txsRunTest(oTxsSession, 'VBoxLinuxAdditions.run', 5 * 60 * 1000,
-                '/bin/sh', ('/bin/sh', '${CDROM}/VBoxLinuxAdditions.run'));
-            if not fRc \
-            or oTxsSession.getResult() is False:
+                '/bin/sh', ('/bin/sh', '${CDROM}/VBoxLinuxAdditions.run'), fCheckSessionStatus = True);
+            if not fRc:
                 reporter.error('Installing Linux Additions failed (see log file for details)');