Changeset 62104 in vbox for trunk

Timestamp:

Jul 7, 2016 1:50:13 PM (9 years ago)

Author:

vboxsync

Message:

testdriver: Changed reporter.flushall() to also flush the XML stream to the server (helps with VBox install/uninstall which is already using it). Made startVmAndconnectToTxsViaTcp do a flushall before starting the VM. Added report.doPollWork in vbox.TestDriver.waitForTasksSleepWorker.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• base.py (modified) (1 diff)
• reporter.py (modified) (2 diffs)
• vbox.py (modified) (2 diffs)

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

@@ -1118 +1118 @@
                         cMsSleep = 1000;
                     fMore = self.waitForTasksSleepWorker(cMsSleep);
-                    reporter.doPollWork('TestDriverBase.waitForTasks'); # shouldn't be necessary, remove when we figure why...
         except KeyboardInterrupt:
             self.fInterrupted = True;

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

@@ -1562 +1562 @@
     return fRc;
 
-def flushall():
+def flushall(fSkipXml = False):
     """
     Flushes all output streams, both standard and logger related.
+    This may also push data to the remote test manager.
     """
     try:    sys.stdout.flush();
@@ -1571 +1572 @@
     except: pass;
 
-    # Note! Current no logger specific streams to flush.
+    g_oLock.acquire();
+    fRc = g_oReporter.xmlFlush(fRetry = False);
+    g_oLock.release();
 
     return True;

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

@@ -1778 +1778 @@
             rc = self.oVBoxMgr.waitForEvents(int(cMsTimeout));
             _ = rc; #reporter.log2('vbox.waitForTasksSleepWorker(%u): true (waitForEvents -> %s)' % (cMsTimeout, rc));
+            reporter.doPollWork('vbox.TestDriver.waitForTasksSleepWorker');
             return True;
         except KeyboardInterrupt:
@@ -3185 +3186 @@
         # Start the VM.
         reporter.log('startVmAndConnectToTxsViaTcp: Starting(/preparing) "%s" (timeout %s s)...' % (sVmName, cMsTimeout / 1000));
+        reporter.flushall();
         oSession = self.startVmByName(sVmName);
         if oSession is not None: