Changeset 78797 in vbox for trunk/src

Timestamp:

May 28, 2019 1:51:18 AM (6 years ago)

Author:

vboxsync

Message:

ValKit: various updates.

Location:

trunk/src/VBox/ValidationKit

Files:

• tests/additions/tdAddBasic1.py (modified) (3 diffs)
• tests/additions/tdAddSharedFolders1.py (modified) (1 diff)
• utils/TestExecServ/win/vboxtxs.xml (added)
• vms/t-win7-32.txt (added)

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

@@ -208 +208 @@
             (fRc, oTxsSession) = self.testLinuxInstallAdditions(oSession, oTxsSession, oTestVm);
         else:
-            reporter.error('Guest Additions installation not implemented for %s yet! (%s)' % \
+            reporter.error('Guest Additions installation not implemented for %s yet! (%s)' %
                            (oTestVm.sKind, oTestVm.sVmName,));
             fRc = False;
@@ -249 +249 @@
         Since this involves rebooting the guest, we will have to create a new TXS session.
         """
+
+        #
+        # Install the public signing key.
+        #
+        if oTestVm.sKind not in ('WindowsNT4', 'Windows2000', 'WindowsXP', 'Windows2003'):
+            self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000, '${CDROM}/cert/VBoxCertUtil.exe',
+                            ('${CDROM}/cert/VBoxCertUtil.exe', 'add-trusted-publisher', '${CDROM}/cert/vbox-sha1.cer'));
+            self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000, '${CDROM}/cert/VBoxCertUtil.exe',
+                            ('${CDROM}/cert/VBoxCertUtil.exe', 'add-trusted-publisher', '${CDROM}/cert/vbox-sha256.cer'));
+
+        #
+        # Delete relevant log files.
+        #
+        # Note! On some guests the files in question still can be locked by the OS, so ignore
+        #       deletion errors from the guest side (e.g. sharing violations) and just continue.
+        #
         asLogFiles = [];
-
         fHaveSetupApiDevLog = False;
-
-        # Delete relevant log files.
         if oTestVm.sKind in ('WindowsNT4',):
             sWinDir = 'C:/WinNT/';
@@ -268 +281 @@
                                                    '/v', 'LogLevel', '/t', 'REG_DWORD', '/d', '0xFF'));
 
-        # On some guests the files in question still can be locked by the OS, so ignore deletion
-        # errors from the guest side (e.g. sharing violations) and just continue.
         for sFile in asLogFiles:
             self.txsRmFile(oSession, oTxsSession, sFile, 10 * 1000, fIgnoreErrors = True);
-
-        # Install the public signing key.
-        if oTestVm.sKind not in ('WindowsNT4', 'Windows2000', 'WindowsXP', 'Windows2003'):
-            ## TODO
-            pass;
 
         #

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

@@ -82 +82 @@
         reporter.log('  --add-shared-folders-tests <t1[:t2[:]]>');
         reporter.log('      Default: all  (%s)' % (':'.join(self.asTestsDef)));
-        reporter.log('  --add-shared-folders-extra-args <fsperf-arg>');
+        reporter.log('  --add-shared-folders-extra-arg <fsperf-arg>');
         reporter.log('      Adds an extra FsPerf argument.  Can be repeated.');