Changeset 93797 in vbox for trunk/src/VBox/ValidationKit/tests/additions

Timestamp:

Feb 16, 2022 4:52:50 PM (3 years ago)

Author:

vboxsync

Message:

Guest Control/Validation Kit: Use a different command on POSIX-y OSes for testing blocking processes.

File:

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

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

@@ -2760 +2760 @@
         """
 
-        sCmd = self.oTstDrv.getGuestSystemShell(oTestVm);
-        asArgs = [sCmd,];
+        sShell = self.oTstDrv.getGuestSystemShell(oTestVm);
+        asArgs = [sShell,];
 
         # Use credential defaults.
@@ -2795 +2795 @@
             try:
                 reporter.log2('Starting stale process #%d...' % (i));
-                oGuestSession.processCreate(sCmd,
+                oGuestSession.processCreate(sShell,
                                             asArgs if self.oTstDrv.fpApiVer >= 5.0 else asArgs[1:], [],
                                             [ vboxcon.ProcessCreateFlag_WaitForStdOut ], 30 * 1000);
@@ -2821 +2821 @@
             #
             if oTestVm.isWindows() or oTestVm.isOS2():
-                asArgs = [ sCmd, '/C', 'dir', '/S', self.oTstDrv.getGuestSystemDir(oTestVm), ];
+                asArgs = [ sShell, '/C', 'dir', '/S', self.oTstDrv.getGuestSystemDir(oTestVm), ];
             else:
-                asArgs = [ sCmd, '-c', 'ls -la ' + self.oTstDrv.getGuestSystemDir(oTestVm), ];
+                asArgs = [ sShell, '-c', 'ls -la ' + self.oTstDrv.getGuestSystemDir(oTestVm), ];
             reporter.log('Starting non-stale processes...');
             aoProcs = [];
@@ -2829 +2829 @@
                 try:
                     reporter.log2('Starting non-stale process #%d...' % (i));
-                    oCurProc = oGuestSession.processCreate(sCmd, asArgs if self.oTstDrv.fpApiVer >= 5.0 else asArgs[1:],
+                    oCurProc = oGuestSession.processCreate(sShell, asArgs if self.oTstDrv.fpApiVer >= 5.0 else asArgs[1:],
                                                            [], [], 0); # Infinite timeout.
                     aoProcs.append(oCurProc);
@@ -2872 +2872 @@
             #
             if oTestVm.isWindows() or oTestVm.isOS2():
+                sCmd   = sShell;
                 asArgs = [ sCmd, '/C', 'pause'];
             else:
+                sCmd   = '/usr/bin/yes';
                 asArgs = [ sCmd ];
             reporter.log('Starting blocking processes...');