Changeset 54585 in vbox for trunk/src/VBox

Timestamp:

Mar 2, 2015 5:06:49 PM (10 years ago)

Author:

vboxsync

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

98724

Message:

ValidationKit: disabled network cleanup script for all test boxes

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py (modified) (1 diff)

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

@@ -714 +714 @@
         # 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    not sHostName.startswith('testboxwin3') \
-          and not sHostName.startswith('testboxharp2') \
-          and not sHostName.startswith('wei01-b6ka-3') \
-          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.');
+        #sHostName = socket.getfqdn();
+        #if    not sHostName.startswith('testboxwin3') \
+        #  and not sHostName.startswith('testboxharp2') \
+        #  and not sHostName.startswith('wei01-b6ka-3') \
+        #  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