Changeset 84161 in vbox for trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

Timestamp:

May 6, 2020 1:29:55 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/tdAddGuestCtrl: Bugfixes for gctrlExecute().

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (4 diffs)

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

@@ -2191 +2191 @@
                             fRc = reporter.errorXcpt('asArgs=%s' % (oTest.asArgs,));
                             break;
-                        reporter.log2('Wait returned: %d' % (eWaitResult,));
+                        #reporter.log2('Wait returned: %d' % (eWaitResult,));
 
                         # Process output:
@@ -2197 +2197 @@
                                                        (vboxcon.ProcessWaitResult_StdErr, 2, 'stderr'), ]:
                             if eWaitResult in (eFdResult, vboxcon.ProcessWaitResult_WaitFlagNotSupported):
-                                reporter.log2('Reading %s ...' % (sFdNm,));
                                 try:
-                                    abBuf = oProcess.Read(1, 64 * 1024, oTest.timeoutMS);
+                                    abBuf = oProcess.read(iFd, 64 * 1024, oTest.timeoutMS);
                                 except KeyboardInterrupt: # Not sure how helpful this is, but whatever.
                                     reporter.error('Process (PID %d) execution interrupted' % (iPid,));
@@ -2205 +2204 @@
                                     except: pass;
                                 except:
-                                    pass; ## @todo test for timeouts and fail on anything else!
+                                    reporter.maybeErrXcpt(fIsError, 'asArgs=%s' % (oTest.asArgs,));
                                 else:
                                     if abBuf:
                                         reporter.log2('Process (PID %d) got %d bytes of %s data' % (iPid, len(abBuf), sFdNm,));
+                                        for sLine in abBuf.splitlines():
+                                            reporter.log('%s: %s' % (sFdNm, sLine));
                                         acbFdOut[iFd] += len(abBuf);
                                         oTest.sBuf     = abBuf; ## @todo Figure out how to uniform + append!
@@ -2933 +2934 @@
         if sVBoxControl:
             # Paths with spaces on windows.
-            atExec.append([ tdTestExec(sCmd = sVBoxControl, asArgs = [ sVBoxControl, 'version' ]),
-                           tdTestResultExec(fRc = True) ]);
+            atExec.append([ tdTestExec(sCmd = sVBoxControl, asArgs = [ sVBoxControl, 'version' ],
+                                       afFlags = [ vboxcon.ProcessCreateFlag_WaitForStdOut,
+                                                   vboxcon.ProcessCreateFlag_WaitForStdErr ]),
+                            tdTestResultExec(fRc = True) ]);
 
         # Build up the final test array for the first batch.