diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-10-03 16:31:43 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-10-03 16:38:42 +0200 |
| commit | c098b462d45236b61970f2bebc74d82801085255 (patch) | |
| tree | 11fe55475b1d564a4840c470df4ed8c9d91d2aab /scripts/Util.py | |
| parent | Fixed typo (diff) | |
| download | ice-c098b462d45236b61970f2bebc74d82801085255.tar.bz2 ice-c098b462d45236b61970f2bebc74d82801085255.tar.xz ice-c098b462d45236b61970f2bebc74d82801085255.zip | |
Improved IceGrid/admin test error detection, fix for #546
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 57856812a41..3dae9d9ac64 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1284,6 +1284,12 @@ class Process(Runnable): print("process {0} is hanging on shutdown - {1}".format(process, time.strftime("%x %X"))) if current.driver.isInterrupted(): raise + except RuntimeError as ex: + output = self.getOutput(current) + if output: + raise RuntimeError(str(ex) + output) + else: + raise ex finally: if not process.isTerminated(): process.terminate() |