Changeset 95758 in vbox

Timestamp:

Jul 20, 2022 6:13:04 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152468

Message:

ValKit/vboxinstaller.py: there is no reporter.info function. bugref:8691

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py (modified) (5 diffs)

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

@@ -914 +914 @@
             return None; # There shouldn't be anything to uninstall, and if there is, it's not our fault.
 
-        # Install the new one.
+        fGreaterOrEqual61 = True; ## @todo Parse the version from the executable.
+
+        # Gather installer arguments.
         asArgs = [sExe, '-vvvv', '--silent', '--logging'];
         asArgs.extend(['--msiparams', 'REBOOT=ReallySuppress']);
@@ -920 +922 @@
         if sVBoxInstallPath is not None:
             asArgs.extend(['INSTALLDIR="%s"' % (sVBoxInstallPath,)]);
-        fGreaterOrEqual61 = True; ## @todo Parse the version from the executable.
+
         if fGreaterOrEqual61:
             # We need to explicitly specify the location, otherwise the log would end up at a random location.
@@ -927 +929 @@
         else: # Prior to 6.1 the location was hardcoded.
             sLogFile = os.path.join(tempfile.gettempdir(), 'VirtualBox', 'VBoxInstallLog.txt');
+
         if  fGreaterOrEqual61 \
         and self._fWinInstallTimestampCA:
@@ -932 +935 @@
             asArgs.extend(['--force-install-timestamp-ca']);
         elif not fGreaterOrEqual61:
-            reporter.info('WARNING: We do not have support for the timestamp CA here! Testing might fail.');
+            reporter.log('WARNING: We do not have support for the timestamp CA here! Testing might fail.');
+
+        # Install it.
         fRc2, iRc = self._sudoExecuteSync(asArgs);
         if fRc2 is False:
@@ -940 +945 @@
                 reporter.error('Installer failed, exit code: %s' % (iRc,));
             fRc = False;
+
+        # Add the installer log if present and wait for the network connection to be restore after the filter driver upset.
         if os.path.isfile(sLogFile):
             reporter.addLogFile(sLogFile, 'log/installer', "Verbose MSI installation log file");
         self._waitForTestManagerConnectivity(30);
+
         return fRc;