VirtualBox

Changeset 94139 in vbox for trunk


Ignore:
Timestamp:
Mar 8, 2022 10:42:18 PM (3 years ago)
Author:
vboxsync
Message:

ValKit/testdriver: pylint 2.9.6 adjustments (missed some).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/ValidationKit/testdriver/base.py

    r93115 r94139  
    286286        if asPsCmd is not None:
    287287            try:
    288                 oPs = subprocess.Popen(asPsCmd, stdout=subprocess.PIPE);
     288                oPs = subprocess.Popen(asPsCmd, stdout=subprocess.PIPE); # pylint: disable=consider-using-with
    289289                sCurName = oPs.communicate()[0];
    290290                iExitCode = oPs.wait();
     
    547547
    548548                cMsWait = cMsTimeout - cMsElapsed
    549                 if cMsWait > 1000:
    550                     cMsWait = 1000;
     549                cMsWait = min(cMsWait, 1000);
    551550                try:
    552551                    self.oCv.wait(cMsWait / 1000.0);
     
    11341133                        break;
    11351134                    cMsSleep = cMsTimeout - cMsElapsed;
    1136                     if cMsSleep > 1000:
    1137                         cMsSleep = 1000;
     1135                    cMsSleep = min(cMsSleep, 1000);
    11381136                    fMore = self.waitForTasksSleepWorker(cMsSleep);
    11391137        except KeyboardInterrupt:
     
    12091207
    12101208        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]);
    12131211
    12141212        try:
     
    15821580            afnMethods = [ sendUserSignal1, processInterrupt, processTerminate, processKill ];
    15831581        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]);
    15861584
    15871585            for i in range(10):
     
    15911589                dPidsToRemove = []; # Temporary dict to append PIDs to remove later.
    15921590
    1593                 for iPid in dPids:
     1591                for iPid, tNameSudo in dPids.items():
    15941592                    if not processExists(iPid):
    1595                         reporter.log('%s (%s) terminated' % (dPids[iPid][0], iPid,));
     1593                        reporter.log('%s (%s) terminated' % (tNameSudo[0], iPid,));
    15961594                        self.pidFileRemove(iPid, fQuiet = True);
    15971595                        dPidsToRemove.append(iPid);
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette