Changeset 62094 in vbox for trunk/src

Timestamp:

Jul 7, 2016 1:25:17 AM (9 years ago)

Author:

vboxsync

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

108567

Message:

testdriver: more xml/poll/reporter hacking.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• base.py (modified) (1 diff)
• vboxwrappers.py (modified) (1 diff)

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

@@ -1114 +1114 @@
                     if cMsElapsed > cMsTimeout: # not ==, we want the final waitForEvents.
                         break;
-                    if cMsTimeout - cMsElapsed > 1000:
-                        fMore = self.waitForTasksSleepWorker(1000);
-                    else:
-                        fMore = self.waitForTasksSleepWorker(cMsTimeout - cMsElapsed);
+                    cMsSleep = cMsTimeout - cMsElapsed;
+                    if cMsSleep > 1000:
+                        cMsSleep = 1000;
+                    fMore = self.waitForTasksSleepWorker(cMsSleep);
+                    reporter.doPollWork(); # shouldn't be necessary, remove when we figure why...
         except KeyboardInterrupt:
             self.fInterrupted = True;

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

@@ -671 +671 @@
             if cMsElapsed > cMsTimeout:
                 break;
-            try:    self.oVBoxMgr.waitForEvents(min(cMsTimeout - cMsElapsed, 10000));
+            cMsSleep = cMsTimeout - cMsElapsed;
+            if cMsSleep > 10000:
+                cMsSleep = 10000;
+            try:    self.oVBoxMgr.waitForEvents(cMsSleep);
             except KeyboardInterrupt: raise;
             except: pass;