Changeset 84949 in vbox

Timestamp:

Jun 25, 2020 12:20:51 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/tdAddBasic1.py: Removed temporary HACK ALERT stuff again [build fix].

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py (modified) (2 diffs)

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

@@ -34 +34 @@
 import sys;
 import uuid;
-if sys.version_info[0] >= 3:
-    from io       import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module,useless-import-alias
-else:
-    from StringIO import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module,useless-import-alias
 
 # Only the main script needs to modify the path.
@@ -187 +183 @@
 
         reporter.testStart('Waiting for TXS + CD');
-        if oTestVm.isLinux():
-            fRc, oTxsSession = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, fCdWait = True,
-                                                                cMsCdWait = 5 * 60 * 1000,
-                                                                sFileCdWait = self.sFileCdWait);
-        else:
-            oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(oTestVm.sVmName, fCdWait = True,
-                                                                      cMsCdWait = 5 * 60 * 1000,
-                                                                      sFileCdWait = self.sFileCdWait);
+        oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(oTestVm.sVmName, fCdWait = True,
+                                                                  cMsCdWait = 5 * 60 * 1000,
+                                                                  sFileCdWait = self.sFileCdWait);
         reporter.testDone();