diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-16 11:44:11 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-16 11:44:11 +0100 |
| commit | b078485931d1589c20c0cd09fbfae910ba5382bc (patch) | |
| tree | a83477f0e95df7cca8b97152809e8a80926d9fc9 /scripts/Util.py | |
| parent | Fixed ICE-7501 & ICE-7502 - Integrated the building of the controller Apps to... (diff) | |
| download | ice-b078485931d1589c20c0cd09fbfae910ba5382bc.tar.bz2 ice-b078485931d1589c20c0cd09fbfae910ba5382bc.tar.xz ice-b078485931d1589c20c0cd09fbfae910ba5382bc.zip | |
Fixed bug where test output was missing when running with --workers
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 2ac39209ac6..043e68d21c7 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1050,12 +1050,14 @@ class Process(Runnable): pass def stop(self, current, waitSuccess=False, exitstatus=0): - if self in current.processes and not current.processes[self].isTerminated(): + if self in current.processes: try: - if waitSuccess: # Wait for the process to exit successfully by itself. + # Wait for the process to exit successfully by itself. + if not current.processes[self].isTerminated() and waitSuccess: current.processes[self].waitSuccess(exitstatus=exitstatus, timeout=60) finally: - current.processes[self].terminate() + if not current.processes[self].isTerminated(): + current.processes[self].terminate() if not self.quiet: # Write the output to the test case (but not on stdout) current.write(self.getOutput(current), stdout=False) |