Changeset 84544 in vbox

Timestamp:

May 26, 2020 4:07:58 PM (4 years ago)

Author:

vboxsync

Message:

Validation Kit/tdAddGuestCtrl.py: Decreased default verbosity for gctrlExecute() a bit.

File:

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

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

@@ -1935 +1935 @@
                 cOthers += aSubResult[3];
             elif eType is vboxcon.FsObjType_File:
-                reporter.log2('  File "%s"' % oFsObjInfo.name);
+                reporter.log4('  File "%s"' % oFsObjInfo.name);
                 cFiles += 1;
             elif eType is vboxcon.FsObjType_Symlink:
-                reporter.log2('  Symlink "%s" -- not tested yet' % oFsObjInfo.name);
+                reporter.log4('  Symlink "%s" -- not tested yet' % oFsObjInfo.name);
                 cOthers += 1;
             elif    oTestVm.isWindows() \
@@ -2098 +2098 @@
         return fRc;
 
-    def gctrlExecute(self, oTest, oGuestSession, fIsError):
+    def gctrlExecute(self, oTest, oGuestSession, fIsError):                     # pylint: disable=too-many-statements
         """
         Helper function to execute a program on a guest, specified in the current test.
@@ -2125 +2125 @@
         # Start the process:
         #
-        reporter.log2('Executing sCmd=%s, afFlags=%s, timeoutMS=%d, asArgs=%s, asEnv=%s'
-                      % (oTest.sCmd, oTest.afFlags, oTest.timeoutMS, oTest.asArgs, oTest.aEnv,));
+        reporter.log2('Executing sCmd=%s, afFlags=%s, timeoutMS=%d, asEnv=%s'
+                      % (oTest.sCmd, oTest.afFlags, oTest.timeoutMS, oTest.aEnv,));
+
+        # Don't be too noisy by default when testing reeeeeeally long arguments.
+        if len(oTest.asArgs) <= 64:
+            reporter.log2('asArgs=%s' % (oTest.asArgs,));
+        else:
+            reporter.log4('asArgs=%s' % (oTest.asArgs,));
+
         try:
             oProcess = oGuestSession.processCreate(oTest.sCmd,
@@ -2205 +2212 @@
                                         reporter.log2('Process (PID %d) got %d bytes of %s data (type: %s)'
                                                       % (iPid, len(abBuf), sFdNm, type(abBuf)));
-                                        sBuf = '';
-                                        if sys.version_info >= (2, 7):
-                                            if isinstance(abBuf, memoryview): ## @todo Why is this happening?
-                                                abBuf = abBuf.tobytes();
-                                                sBuf  = abBuf.decode("utf-8");
-                                        if isinstance(abBuf, buffer):
-                                            sBuf = str(abBuf);
-                                        for sLine in sBuf.splitlines():
-                                            reporter.log('%s: %s' % (sFdNm, sLine));
+                                        if reporter.getVerbosity() >= 4:
+                                            sBuf = '';
+                                            if sys.version_info >= (2, 7):
+                                                if isinstance(abBuf, memoryview): ## @todo Why is this happening?
+                                                    abBuf = abBuf.tobytes();
+                                                    sBuf  = abBuf.decode("utf-8");
+                                            if isinstance(abBuf, buffer):
+                                                sBuf = str(abBuf);
+                                            for sLine in sBuf.splitlines():
+                                                reporter.log4('%s: %s' % (sFdNm, sLine));
                                         acbFdOut[iFd] += len(abBuf);
                                         oTest.sBuf     = abBuf; ## @todo Figure out how to uniform + append!