Changeset 83294 in vbox for trunk/src/VBox/ValidationKit/testdriver/base.py

Timestamp:

Mar 16, 2020 8:13:27 AM (5 years ago)

Author:

vboxsync

Message:

ValidationKit/testdriver: Fixed exceptions where removing PIDs in actionAbort() will in result in RuntimeErrors.

File:

• trunk/src/VBox/ValidationKit/testdriver/base.py (modified) (2 diffs)

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

@@ -1588 +1588 @@
                     time.sleep(1);
 
+                dPidsToRemove = []; # Temporary dict to append PIDs to remove later.
+
                 for iPid in dPids:
                     if not processExists(iPid):
                         reporter.log('%s (%s) terminated' % (dPids[iPid][0], iPid,));
                         self.pidFileRemove(iPid, fQuiet = True);
-                        del dPids[iPid];
+                        dPidsToRemove.append(iPid);
+                        continue;
+
+                # Remove PIDs from original dictionary, as removing keys from a
+                # dictionary while iterating on it won't work and will result in a RuntimeError.
+                for iPidToRemove in dPidsToRemove:
+                    del dPids[iPidToRemove];
 
                 if not dPids:
@@ -1811 +1819 @@
     unittest.main();
     # not reached.
-