raise SystemExit() generally preferred to sys.exit(1)

5 files changed, 9 insertions, 20 deletions

diff --git a/test cases/python/1 basic/prog.py b/test cases/python/1 basic/prog.py
index 9d95aea..720fdb1 100755
--- a/test cases/python/1 basic/prog.py
+++ b/test cases/python/1 basic/prog.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
 
 from gluon import gluonator
-import sys
 
 print('Running mainprog from root dir.')
 
 if gluonator.gluoninate() != 42:
-    sys.exit(1)
+    raise ValueError("!= 42")
diff --git a/test cases/python/1 basic/subdir/subprog.py b/test cases/python/1 basic/subdir/subprog.py
index 08652f0..54178e5 100755
--- a/test cases/python/1 basic/subdir/subprog.py
+++ b/test cases/python/1 basic/subdir/subprog.py
@@ -4,9 +4,8 @@
 # point to source root.
 
 from gluon import gluonator
-import sys
 
 print('Running mainprog from subdir.')
 
 if gluonator.gluoninate() != 42:
-    sys.exit(1)
+    raise ValueError("!= 42")
diff --git a/test cases/python/2 extmodule/blaster.py b/test cases/python/2 extmodule/blaster.py
index 7e1eae6..1f01876 100755
--- a/test cases/python/2 extmodule/blaster.py
+++ b/test cases/python/2 extmodule/blaster.py
@@ -1,14 +1,11 @@
 #!/usr/bin/env python3
 
 import tachyon
-import sys
 
 result = tachyon.phaserize('shoot')
 
 if not isinstance(result, int):
-    print('Returned result not an integer.')
-    sys.exit(1)
+    raise SystemExit('Returned result not an integer.')
 
 if result != 1:
-    print('Returned result {} is not 1.'.format(result))
-    sys.exit(1)
+    raise SystemExit('Returned result {} is not 1.'.format(result))
diff --git a/test cases/python/3 cython/cytest.py b/test cases/python/3 cython/cytest.py
index 43443dc..c08ffee 100755
--- a/test cases/python/3 cython/cytest.py
+++ b/test cases/python/3 cython/cytest.py
@@ -1,23 +1,19 @@
 #!/usr/bin/env python3
 
 from storer import Storer
-import sys
 
 s = Storer()
 
 if s.get_value() != 0:
-    print('Initial value incorrect.')
-    sys.exit(1)
+    raise SystemExit('Initial value incorrect.')
 
 s.set_value(42)
 
 if s.get_value() != 42:
-    print('Setting value failed.')
-    sys.exit(1)
+    raise SystemExit('Setting value failed.')
 
 try:
     s.set_value('not a number')
-    print('Using wrong argument type did not fail.')
-    sys.exit(1)
+    raise SystemExit('Using wrong argument type did not fail.')
 except TypeError:
     pass
diff --git a/test cases/python/4 custom target depends extmodule/blaster.py b/test cases/python/4 custom target depends extmodule/blaster.py
index 6106f6b..09039cb 100644
--- a/test cases/python/4 custom target depends extmodule/blaster.py
+++ b/test cases/python/4 custom target depends extmodule/blaster.py
@@ -24,9 +24,7 @@ if options.output:
         f.write('success')
 
 if not isinstance(result, int):
-    print('Returned result not an integer.')
-    sys.exit(1)
+    raise SystemExit('Returned result not an integer.')
 
 if result != 1:
-    print('Returned result {} is not 1.'.format(result))
-    sys.exit(1)
+    raise SystemExit('Returned result {} is not 1.'.format(result))