summaryrefslogtreecommitdiff
path: root/scripts/Expect.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-08-26 23:40:45 +0200
committerJose <jose@zeroc.com>2013-08-26 23:40:45 +0200
commit877867405ea5065ed582636d629999e202a3ede3 (patch)
tree24e45ab1c59dbd046e28e6c655a5fcc6497ea2bb /scripts/Expect.py
parentFixed (ICE-5406) - IceGridGUI save to file NPE (diff)
downloadice-877867405ea5065ed582636d629999e202a3ede3.tar.bz2
ice-877867405ea5065ed582636d629999e202a3ede3.tar.xz
ice-877867405ea5065ed582636d629999e202a3ede3.zip
Test & Build auotomation scripts
Diffstat (limited to 'scripts/Expect.py')
-rwxr-xr-xscripts/Expect.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Expect.py b/scripts/Expect.py
index 45edb751acc..f7156dbe649 100755
--- a/scripts/Expect.py
+++ b/scripts/Expect.py
@@ -551,7 +551,7 @@ class Expect (object):
def test(result, expected):
if expected != result:
print("unexpected exit status: expected: %d, got %d" % (expected, result))
- assert False
+ sys.exit(1)
self.wait(timeout)
if self.mapping == "java":
@@ -562,9 +562,9 @@ class Expect (object):
if self.killed == signal.SIGINT:
test(130, self.exitstatus)
else:
- assert False
+ sys.exit(1)
else:
- assert self.exitstatus == exitstatus
+ test(self.exitstatus, exitstatus)
else:
test(self.exitstatus, exitstatus)
@@ -575,7 +575,7 @@ class Expect (object):
self.wait(timeout)
if self.exitstatus == 0:
print("unexpected non-zero exit status")
- assert False
+ sys.exit(1)
def trace(self, suppress = None):
self.r.enabletrace(suppress)