Changeset 103380 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Feb 15, 2024 10:31:06 AM (10 months ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Added and internal _printEnv() which can log (stripped) environment blocks.

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (3 diffs)

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

@@ -1117 +1117 @@
         return self.fImportedVBoxApi;
 
+    def _printEnv(self, dEnv = os.environ, fRaw = False):
+        """
+        Prints the given environment block to log2.
+
+        Uses the default environment block if not specified explicitly.
+        Removes any control characters found to not mess up the screen output.
+        """
+        for sKey, sVal in sorted(dEnv.items()):
+            reporter.log2('%s=%s' % (sKey, sVal if fRaw else re.sub(r'[\x00-\x1f]', '', sVal)));
+
     def _startVBoxSVC(self): # pylint: disable=too-many-statements
         """ Starts VBoxSVC. """
@@ -1135 +1145 @@
 
         reporter.log2('VBoxSVC environment:');
-        for sKey, sVal in sorted(os.environ.items()):
-            reporter.log2('%s=%s' % (sKey, sVal));
+        self._printEnv();
 
         # Always leave a pid file behind so we can kill it during cleanup-before.
@@ -1387 +1396 @@
 
         reporter.log2('Self environment:');
-        for sKey, sVal in sorted(os.environ.items()):
-            reporter.log2('%s=%s' % (sKey, sVal));
+        self._printEnv();
 
         # Hack the sys.path + environment so the vboxapi can be found.