Changeset 53771 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Jan 12, 2015 11:20:59 AM (10 years ago)

Author:

vboxsync

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

97577

Message:

Validation Kit: run network cleanup script before install, not after uninstall; exclude testboxharp2

File:

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

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

@@ -711 +711 @@
             return False;
 
+        # TEMPORARY HACK - START
+        # It seems that running the NDIS cleanup script upon uninstallation is not
+        # a good idea, so let's run it before installing VirtualBox.
+        sHostName = socket.getfqdn();
+        if fRc and not sHostName.startswith('testboxwin3') \
+               and not sHostName.startswith('testboxharp2') \
+               and utils.getHostOsVersion() in ['8', '8.1', '9', '2008Server', '2008ServerR2', '2012Server']:
+            reporter.log('Peforming extra NDIS cleanup...');
+            sMagicScript = os.path.abspath(os.path.join(g_ksValidationKitDir, 'testdriver', 'win-vbox-net-uninstall.ps1'));
+            fRc2, _ = self._sudoExecuteSync(['powershell.exe', '-Command', 'set-executionpolicy unrestricted']);
+            if not fRc2:
+                reporter.log('set-executionpolicy failed.');
+            self._sudoExecuteSync(['powershell.exe', '-Command', 'get-executionpolicy']);
+            fRc2, _ = self._sudoExecuteSync(['powershell.exe', '-File', sMagicScript]);
+            if not fRc2:
+                reporter.log('NDIS cleanup failed.');
+        # TEMPORARY HACK - END
+
         # Uninstall any previous vbox version first.
         fRc = self._uninstallVBoxOnWindows();
@@ -786 +804 @@
             reporter.addLogFile(sLogFile, 'log/uninstaller', "Verbose MSI uninstallation log file");
 
-        # TEMPORARY HACK - START
-        sHostName = socket.getfqdn();
-        if fRc and not sHostName.startswith('testboxwin3') \
-               and utils.getHostOsVersion() in ['8', '8.1', '9', '2008Server', '2008ServerR2', '2012Server']:
-            reporter.log('Peforming extra NDIS cleanup...');
-            sMagicScript = os.path.abspath(os.path.join(g_ksValidationKitDir, 'testdriver', 'win-vbox-net-uninstall.ps1'));
-            fRc2, _ = self._sudoExecuteSync(['powershell.exe', '-Command', 'set-executionpolicy unrestricted']);
-            if not fRc2:
-                reporter.log('set-executionpolicy failed.');
-            self._sudoExecuteSync(['powershell.exe', '-Command', 'get-executionpolicy']);
-            fRc2, _ = self._sudoExecuteSync(['powershell.exe', '-File', sMagicScript]);
-            if not fRc2:
-                reporter.log('NDIS cleanup failed.');
-        # TEMPORARY HACK - END
-
         self._waitForTestManagerConnectivity(30);
         if fRc is False and os.path.isfile(sLogFile):