Changeset 93139 in vbox for trunk/src/VBox

Timestamp:

Jan 7, 2022 3:41:29 PM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/Guest Control: Renaming / cleanup.

File:

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

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

@@ -2745 +2745 @@
         oCreds.applyDefaultsIfNotSet(oTestVm);
 
-        # Number of stale guest processes to create.
-        cStaleProcs = 10;
+        # Number of guest processes per group to create.
+        cProcsPerGroup = 10;
 
         #
@@ -2770 +2770 @@
         reporter.log('Starting stale processes...');
         fRc = True;
-        for i in xrange(0, cStaleProcs):
+        for i in xrange(0, cProcsPerGroup):
             try:
                 reporter.log2('Starting stale process #%d...' % (i));
@@ -2776 +2776 @@
                                             asArgs if self.oTstDrv.fpApiVer >= 5.0 else asArgs[1:], [],
                                             [ vboxcon.ProcessCreateFlag_WaitForStdOut ], 30 * 1000);
+                # Note: Not keeping a process reference from the created process above is intentional and part of the test!
+
                 # Note: Use a timeout in the call above for not letting the stale processes
                 #       hanging around forever.  This can happen if the installed Guest Additions
@@ -2785 +2787 @@
         if fRc:
             reporter.log2('Starting stale processes successful');
-            try:    cProcesses = len(self.oTstDrv.oVBoxMgr.getArray(oGuestSession, 'processes'));
-            except: fRc        = reporter.errorXcpt();
+            try:    cProcs = len(self.oTstDrv.oVBoxMgr.getArray(oGuestSession, 'processes'));
+            except: fRc    = reporter.errorXcpt();
             else:
-                reporter.log2('Proccess count is: %d' % (cProcesses));
-                if cProcesses != cStaleProcs:
-                    fRc = reporter.error('Got %d stale processes, expected %d (stale)' % (cProcesses, cStaleProcs));
+                reporter.log2('Proccess count is: %d' % (cProcs));
+                if cProcs != cProcsPerGroup:
+                    fRc = reporter.error('Got %d stale processes, expected %d (stale)' % (cProcs, cProcsPerGroup));
 
         if fRc:
@@ -2801 +2803 @@
                 asArgs = [ sCmd, '-c', 'ls -la ' + self.oTstDrv.getGuestSystemDir(oTestVm), ];
             reporter.log('Starting non-stale processes...');
-            aoProcesses = [];
-            for i in xrange(0, cStaleProcs):
+            aoProcs = [];
+            for i in xrange(0, cProcsPerGroup):
                 try:
                     reporter.log2('Starting non-stale process #%d...' % (i));
                     oCurProc = oGuestSession.processCreate(sCmd, asArgs if self.oTstDrv.fpApiVer >= 5.0 else asArgs[1:],
                                                            [], [], 0); # Infinite timeout.
-                    aoProcesses.append(oCurProc);
+                    aoProcs.append(oCurProc);
                 except:
                     fRc = reporter.errorXcpt('Creating non-stale process #%d failed:' % (i,));
                     break;
 
-            try:    cProcesses = len(self.oTstDrv.oVBoxMgr.getArray(oGuestSession, 'processes'));
-            except: fRc        = reporter.errorXcpt();
+            try:    cProcs = len(self.oTstDrv.oVBoxMgr.getArray(oGuestSession, 'processes'));
+            except: fRc    = reporter.errorXcpt();
             else:
-                reporter.log2('Proccess count is: %d' % (cProcesses));
+                reporter.log2('Proccess count is: %d' % (cProcs));
 
             reporter.log('Waiting for non-stale processes to terminate...');
-            for i, oProcess in enumerate(aoProcesses):
+            for i, oProcess in enumerate(aoProcs):
                 try:
                     reporter.log('Waiting for non-stale process #%d...' % (i));
@@ -2832 +2834 @@
                 reporter.log('All non-stale processes ended successfully');
 
-            try:    cProcesses = len(self.oTstDrv.oVBoxMgr.getArray(oGuestSession, 'processes'));
-            except: fRc        = reporter.errorXcpt();
+            try:    cProcs = len(self.oTstDrv.oVBoxMgr.getArray(oGuestSession, 'processes'));
+            except: fRc    = reporter.errorXcpt();
             else:
-                reporter.log2('Proccess count is: %d' % (cProcesses));
+                reporter.log2('Proccess count is: %d' % (cProcs));
 
                 # Here we count the stale processes (that is, processes we don't have a reference
-                # anymore for) and the started + terminated non-stale processes (that we still keep
+                # anymore for) and the started + ended non-stale processes (that we still keep
                 # a reference in aoProcesses[] for).
-                cProcsExpected = cStaleProcs * 2;
-                if cProcesses != cProcsExpected:
+                cProcsExpected = cProcsPerGroup * 2;
+                if cProcs != cProcsExpected:
                     fRc = reporter.error('Got %d total processes, expected %d (stale vs. non-stale)' \
-                                         % (cProcesses, cProcsExpected));
+                                         % (cProcs, cProcsExpected));
             #
             # Fire off non-stale blocking processes which are terminated via terminate().
@@ -2852 +2854 @@
                 asArgs = [ sCmd ];
             reporter.log('Starting blocking processes...');
-            aoProcesses = [];
-            for i in xrange(0, cStaleProcs):
+            aoProcs = [];
+            for i in xrange(0, cProcsPerGroup):
                 try:
                     reporter.log2('Starting blocking process #%d...' % (i));
@@ -2861 +2863 @@
                     #       hanging around forever.  This can happen if the installed Guest Additions
                     #       do not support terminating guest processes.
-                    aoProcesses.append(oCurProc);
+                    aoProcs.append(oCurProc);
                 except:
                     fRc = reporter.errorXcpt('Creating non-stale blocking process #%d failed:' % (i,));
@@ -2870 +2872 @@
 
             reporter.log2('Terminating blocking processes...');
-            for i, oProcess in enumerate(aoProcesses):
+            for i, oProcess in enumerate(aoProcs):
                 try:
                     reporter.log('Terminating blocking process #%d...' % (i));
@@ -2882 +2884 @@
 
             # There still should be 20 processes because we just terminated the 10 blocking ones above.
-            try:    cProcesses = len(self.oTstDrv.oVBoxMgr.getArray(oGuestSession, 'processes'));
-            except: fRc        = reporter.errorXcpt();
+            try:    cProcs = len(self.oTstDrv.oVBoxMgr.getArray(oGuestSession, 'processes'));
+            except: fRc    = reporter.errorXcpt();
             else:
-                if cProcesses != (cStaleProcs * 2):
-                    fRc = reporter.error('Got %d total processes, expected %d (final)' % (cProcesses, cStaleProcs));
-                reporter.log2('Final guest session processes count: %d' % (cProcesses,));
+                if cProcs != cProcsPerGroup * 2:
+                    fRc = reporter.error('Got %d total processes, expected %d (final)' % (cProcs, cProcsPerGroup));
+                reporter.log2('Final guest session processes count: %d' % (cProcs,));
 
         if not fRc: