Changeset 61953 in vbox

Timestamp:

Jun 30, 2016 10:38:53 AM (9 years ago)

Author:

vboxsync

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

108396

Message:

testdriver: Added a doPollWork method to the reporter so the XML can be flushed while waiting for VMs to run and other things. Inserted a few called to the method in base.py, vbox.py and vboxwrapper.py.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• base.py (modified) (1 diff)
• reporter.py (modified) (3 diffs)
• vbox.py (modified) (1 diff)
• vboxwrappers.py (modified) (4 diffs)

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

@@ -514 +514 @@
                     cMsWait = 1000;
                 try:
-                    self.oCv.wait(cMsWait / 1000)
+                    self.oCv.wait(cMsWait / 1000.0);
                 except:
                     pass;
+                reporter.doPollWork();
                 fState = self.pollTask(True);
 

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

@@ -285 +285 @@
             self.testDone(False, sCaller);
         return False;
+
+    #
+    # Misc.
+    #
+
+    def doPollWork(self):
+        """
+        Check if any pending stuff expired and needs doing.
+        """
+        return None;
+
 
 
@@ -925 +936 @@
         return None;
 
+    def doPollWork(self):
+        if len(self._asXml) > 0:
+            g_oLock.acquire();
+            self._xmlFlushIfNecessary();
+            g_oLock.release();
+        return None;
+
 
 #
@@ -1356 +1374 @@
     return cErrors;
 
+def doPollWork():
+    """
+    This can be called from wait loops and similar to make the reporter call
+    home with pending XML and such.
+    """
+    g_oReporter.doPollWork();
+    return None;
+
 
 #

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

@@ -2289 +2289 @@
                 return -1
 
+            reporter.doPollWork();
             try:    oProgress.waitForCompletion(cMsInterval);
             except: return -2;

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

@@ -223 +223 @@
             except KeyboardInterrupt: raise;
             except: pass;
+            reporter.doPollWork();
             fState = self.pollTask(False);
         return fState;
@@ -409 +410 @@
                 reporter.errorXcpt(self.sName);
                 return -2;
+            reporter.doPollWork();
 
         try:
@@ -481 +483 @@
                     reporter.errorXcpt(self.sName);
                 return -2;
+            reporter.doPollWork();
         # Not reached.
 
@@ -668 +671 @@
             if cMsElapsed > cMsTimeout:
                 break;
-            try:    self.oVBoxMgr.waitForEvents(cMsTimeout - cMsElapsed);
+            try:    self.oVBoxMgr.waitForEvents(min(cMsTimeout - cMsElapsed, 10000));
             except KeyboardInterrupt: raise;
             except: pass;
+            reporter.doPollWork();
             fState = self.pollTask(False);
         return fState;