Changeset 92574 in vbox for trunk/src/VBox/ValidationKit/testboxscript

Timestamp:

Nov 23, 2021 9:21:30 PM (3 years ago)

Author:

vboxsync

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

148456

Message:

ValidationKit: More fixing in testboxscript upgrade code for python compatibility, version 2 and < 3.3 cannot wait with timeout, use own implementation.

File:

• trunk/src/VBox/ValidationKit/testboxscript/testboxupgrade.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testboxscript/testboxupgrade.py

@@ -35 +35 @@
 import subprocess
 import threading
+import time
 import uuid;
 import zipfile
@@ -134 +135 @@
     oThread.join(30);
 
-    oChild.wait(5);
+    # Give child up to 5 seconds to terminate after producing output.
+    if sys.version_info[0] >= 3 and sys.version_info[1] >= 3:
+        oChild.wait(5);
+    else:
+        for i in range(50):
+            iStatus = oChild.poll();
+            if iStatus is None:
+                break;
+            time.sleep(0.1);
     iStatus = oChild.poll();
     if iStatus is None: