- Timestamp:
- Mar 8, 2022 10:42:18 PM (3 years ago)
- File:
-
- 1 edited
-
trunk/src/VBox/ValidationKit/testdriver/base.py (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/ValidationKit/testdriver/base.py
r93115 r94139 286 286 if asPsCmd is not None: 287 287 try: 288 oPs = subprocess.Popen(asPsCmd, stdout=subprocess.PIPE); 288 oPs = subprocess.Popen(asPsCmd, stdout=subprocess.PIPE); # pylint: disable=consider-using-with 289 289 sCurName = oPs.communicate()[0]; 290 290 iExitCode = oPs.wait(); … … 547 547 548 548 cMsWait = cMsTimeout - cMsElapsed 549 if cMsWait > 1000: 550 cMsWait = 1000; 549 cMsWait = min(cMsWait, 1000); 551 550 try: 552 551 self.oCv.wait(cMsWait / 1000.0); … … 1134 1133 break; 1135 1134 cMsSleep = cMsTimeout - cMsElapsed; 1136 if cMsSleep > 1000: 1137 cMsSleep = 1000; 1135 cMsSleep = min(cMsSleep, 1000); 1138 1136 fMore = self.waitForTasksSleepWorker(cMsSleep); 1139 1137 except KeyboardInterrupt: … … 1209 1207 1210 1208 sPid = ''; 1211 for iPid2 in dPids:1212 sPid += '%s:%s:%s\n' % (iPid2, 'sudo' if dPids[iPid2][1] else 'normal', dPids[iPid2][0]);1209 for iPid2, tNameSudo in dPids.items(): 1210 sPid += '%s:%s:%s\n' % (iPid2, 'sudo' if tNameSudo[1] else 'normal', tNameSudo[0]); 1213 1211 1214 1212 try: … … 1582 1580 afnMethods = [ sendUserSignal1, processInterrupt, processTerminate, processKill ]; 1583 1581 for fnMethod in afnMethods: 1584 for iPid in dPids:1585 fnMethod(iPid, fSudo = dPids[iPid][1]);1582 for iPid, tNameSudo in dPids.items(): 1583 fnMethod(iPid, fSudo = tNameSudo[1]); 1586 1584 1587 1585 for i in range(10): … … 1591 1589 dPidsToRemove = []; # Temporary dict to append PIDs to remove later. 1592 1590 1593 for iPid in dPids:1591 for iPid, tNameSudo in dPids.items(): 1594 1592 if not processExists(iPid): 1595 reporter.log('%s (%s) terminated' % ( dPids[iPid][0], iPid,));1593 reporter.log('%s (%s) terminated' % (tNameSudo[0], iPid,)); 1596 1594 self.pidFileRemove(iPid, fQuiet = True); 1597 1595 dPidsToRemove.append(iPid);
Note:
See TracChangeset
for help on using the changeset viewer.

