diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-07-13 15:14:39 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-07-13 15:14:39 +0200 |
| commit | 2178cc1d451e649356026ef375629ef5caca55d4 (patch) | |
| tree | 06147e6a2892267ee133402a0579ff14d008950c /scripts/Util.py | |
| parent | Update UWP test projects to use additional options (diff) | |
| download | ice-2178cc1d451e649356026ef375629ef5caca55d4.tar.bz2 ice-2178cc1d451e649356026ef375629ef5caca55d4.tar.xz ice-2178cc1d451e649356026ef375629ef5caca55d4.zip | |
Fix for ICE-8309 - check for spurious selector wakeups
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 636c4a60a48..e2137a8116b 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1147,8 +1147,8 @@ class Process(Runnable): current.write(self.getOutput(current), stdout=False) def teardown(self, current, success): - assert self in current.processes - current.processes[self].teardown(current, success) + if self in current.processes: + current.processes[self].teardown(current, success) def expect(self, current, pattern, timeout=60): assert(self in current.processes and isinstance(current.processes[self], Expect.Expect)) @@ -1774,7 +1774,7 @@ class LocalProcessController(ProcessController): def teardown(self, current, success): if self.traceFile: - if success: + if success or current.driver.isInterrupted(): os.remove(self.traceFile) else: current.writeln("saved {0}".format(self.traceFile)) |