Skip to contentSkip to conversation

semanage/test-semanage.py: Return non-zero value when some of unittest tests fail

PATCH Applied Petr Lautrbach 2 participants 3 messages May 11, 2020 – May 13, 2020 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 semanage/test-semanage.py: Return non-zero value when some of unittest tests fail

Previously python/semanage/test-semanage.py returned 0 even when there was a fail in some test and make test didn't indicate any problem.

Fixes:

    $ make test
    ...
    Ran 10 tests in 110.854s
    FAILED (failures=4)
    $ echo $?
    0
---
 python/semanage/test-semanage.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
python/semanage/test-semanage.py +7 -5
index c8f6ec231fc2..d99e3fdaa211 100644
@@ -233,7 +233,7 @@ def semanage_custom_suite(test_list):
 
 
 def semanage_run_test(suite):
-    unittest.TextTestRunner(verbosity=2).run(suite)
+    return unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
 
 
 class CheckTest(argparse.Action):
@@ -255,9 +255,9 @@ def semanage_args(args):
         for i in semanage_test_list:
             print(i)
     if args.all:
-        semanage_run_test(semanage_suite())
+        return semanage_run_test(semanage_suite())
     if args.test:
-        semanage_run_test(semanage_custom_suite(args.test))
+        return semanage_run_test(semanage_custom_suite(args.test))
 
 
 def gen_semanage_test_args(parser):
@@ -281,8 +281,10 @@ if __name__ == "__main__":
         gen_semanage_test_args(parser)
         try:
             args = parser.parse_args()
-            args.func(args)
-            sys.exit(0)
+            if args.func(args):
+                sys.exit(0)
+            else:
+                sys.exit(1)
         except ValueError as e:
             sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e)))
             sys.exit(1)
Signature · 1 line
2.26.2
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Petr Lautrbach

Previously python/semanage/test-semanage.py returned 0 even when there was a fail in some test and make test didn't indicate any problem.

Fixes:

Quoted 8 lines
    $ make test
    ...
    Ran 10 tests in 110.854s
    FAILED (failures=4)
    $ echo $?
    0

Nice catch! Thanks
Nicolas

Quoted 45 lines
---
 python/semanage/test-semanage.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
python/semanage/test-semanage.py +7 -6
index c8f6ec231fc2..d99e3fdaa211 100644
@@ -233,7 +233,7 @@ def semanage_custom_suite(test_list):
 
 
 def semanage_run_test(suite):
-    unittest.TextTestRunner(verbosity=2).run(suite)
+    return unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
 
 
 class CheckTest(argparse.Action):
@@ -255,9 +255,9 @@ def semanage_args(args):
         for i in semanage_test_list:
             print(i)
     if args.all:
-        semanage_run_test(semanage_suite())
+        return semanage_run_test(semanage_suite())
     if args.test:
-        semanage_run_test(semanage_custom_suite(args.test))
+        return semanage_run_test(semanage_custom_suite(args.test))
 
 
 def gen_semanage_test_args(parser):
@@ -281,8 +281,10 @@ if __name__ == "__main__":
         gen_semanage_test_args(parser)
         try:
             args = parser.parse_args()
-            args.func(args)
-            sys.exit(0)
+            if args.func(args):
+                sys.exit(0)
+            else:
+                sys.exit(1)
         except ValueError as e:
             sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e)))
             sys.exit(1)
--

2.26.2

author Applied
#2 lore raw
In reply to Petr Lautrbach
Quoted 11 lines · Petr Lautrbach

Previously python/semanage/test-semanage.py returned 0 even when there was a fail in some test and make test didn't indicate any problem.

Fixes:

    $ make test
    ...
    Ran 10 tests in 110.854s
    FAILED (failures=4)
    $ echo $?
    0
Quoted 2 lines

Applied.

Quoted 42 lines
---
 python/semanage/test-semanage.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
python/semanage/test-semanage.py +7 -5
index c8f6ec231fc2..d99e3fdaa211 100644
@@ -233,7 +233,7 @@ def semanage_custom_suite(test_list):
 
 
 def semanage_run_test(suite):
-    unittest.TextTestRunner(verbosity=2).run(suite)
+    return unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
 
 
 class CheckTest(argparse.Action):
@@ -255,9 +255,9 @@ def semanage_args(args):
         for i in semanage_test_list:
             print(i)
     if args.all:
-        semanage_run_test(semanage_suite())
+        return semanage_run_test(semanage_suite())
     if args.test:
-        semanage_run_test(semanage_custom_suite(args.test))
+        return semanage_run_test(semanage_custom_suite(args.test))
 
 
 def gen_semanage_test_args(parser):
@@ -281,8 +281,10 @@ if __name__ == "__main__":
         gen_semanage_test_args(parser)
         try:
             args = parser.parse_args()
-            args.func(args)
-            sys.exit(0)
+            if args.func(args):
+                sys.exit(0)
+            else:
+                sys.exit(1)
         except ValueError as e:
             sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e)))
             sys.exit(1)
Signature · 2 lines
()  ascii ribbon campaign - against html e-mail 
/\  www.asciiribbon.org   - against proprietary attachments