Merge pull request diffblue#581 from diffblue/owen-jones-diffblue/use-check-call-when-compiling-tests

owen-jones-diffblue · web-flow · commit 23579f43d84e · 2018-08-28T16:41:34.000+01:00
Use check_call when compiling tests
diff --git a/regression/end_to_end/early_check/test_early_check.py b/regression/end_to_end/early_check/test_early_check.py
@@ -10,7 +10,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_early_check_catch_impossible_taint_flow_01(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -29,7 +29,7 @@ def test_early_check_catch_impossible_taint_flow_01(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_early_check_catch_impossible_taint_flow_02(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -48,7 +48,7 @@ def test_early_check_catch_impossible_taint_flow_02(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_early_check_miss_impossible_taint_flow_01(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -67,7 +67,7 @@ def test_early_check_miss_impossible_taint_flow_01(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_early_check_miss_impossible_taint_flow_02(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
diff --git a/regression/end_to_end/entry_point/test_entry_point.py b/regression/end_to_end/entry_point/test_entry_point.py
@@ -20,7 +20,7 @@ class 'B' and 'X' is a derived class from 'B' not reimplementing 'f'.
     then, the test will pass, but passing 'Child.foo' leads to a failure.
     """
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
diff --git a/regression/end_to_end/general001/test_general001.py b/regression/end_to_end/general001/test_general001.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_general001(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "taint_traces_01_rules.json",
diff --git a/regression/end_to_end/general002/test_general002.py b/regression/end_to_end/general002/test_general002.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_general002(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "taint_traces_02_rules.json",
diff --git a/regression/end_to_end/general003/test_general003.py b/regression/end_to_end/general003/test_general003.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_general003(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "taint_traces_03_rules.json",
diff --git a/regression/end_to_end/general004/test_general004.py b/regression/end_to_end/general004/test_general004.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_general004(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "taint_traces_04_rules.json",
diff --git a/regression/end_to_end/general005/test_general005.py b/regression/end_to_end/general005/test_general005.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_general005(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "taint_traces_05_rules.json",
diff --git a/regression/end_to_end/general006/test_general006.py b/regression/end_to_end/general006/test_general006.py
@@ -11,7 +11,7 @@ def test_general006(load_strategy):
     # Compiling this test with ant is hard because of the dependency on Tomcat. Eventually we should use Maven to
     # build all of the tests as part of building security-scanner. For now, we use a pre-compiled file.
     # with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-    #     subprocess.call(["ant"])
+    #     subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "taint_traces_06.war",
             "taint_traces_06_rules.json",
diff --git a/regression/end_to_end/general007/test_general007.py b/regression/end_to_end/general007/test_general007.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_general007(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "taint_traces_07_rules.json",
diff --git a/regression/end_to_end/interprocedural00/test_interprocedural00.py b/regression/end_to_end/interprocedural00/test_interprocedural00.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_interprocedural00(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = run_security_analyser_pipeline(
         "build",
         "rules.json",
diff --git a/regression/end_to_end/interprocedural01/test_interprocedural01.py b/regression/end_to_end/interprocedural01/test_interprocedural01.py
@@ -11,7 +11,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_interprocedural01(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = run_security_analyser_pipeline(
         "build",
         "rules.json",
diff --git a/regression/end_to_end/multitaint/test_multitaint.py b/regression/end_to_end/multitaint/test_multitaint.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_multitaint(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = run_security_analyser_pipeline(
         "build",
         "rules.json",
diff --git a/regression/end_to_end/object_with_extra_fields/test_object_with_extra_fields.py b/regression/end_to_end/object_with_extra_fields/test_object_with_extra_fields.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_start_with_passed_object(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -24,7 +24,7 @@ def test_start_with_passed_object(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_start_with_passed_array_of_objects(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -39,7 +39,7 @@ def test_start_with_passed_array_of_objects(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_start_with_passed_self(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -54,7 +54,7 @@ def test_start_with_passed_self(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_start_with_passed_self_simple(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -69,7 +69,7 @@ def test_start_with_passed_self_simple(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_start_with_passed_self_array_simple(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -84,7 +84,7 @@ def test_start_with_passed_self_array_simple(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_start_with_passed_self_array_field(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -100,7 +100,7 @@ def test_start_with_passed_self_array_field(load_strategy):
 def ZZZtest_start_with_passed_self_array_array(load_strategy):
     # Disabled (by ZZZ prefix), because JBMC does not terminate.
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -115,7 +115,7 @@ def ZZZtest_start_with_passed_self_array_array(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_call_nondetWithNull(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
@@ -130,7 +130,7 @@ def test_call_nondetWithNull(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_call_nondetWithNull_twice(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
diff --git a/regression/end_to_end/overloaded_source/test_overloaded_source.py b/regression/end_to_end/overloaded_source/test_overloaded_source.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_overloaded_source(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
diff --git a/regression/end_to_end/taint_array_from_elements/test_taint_array_from_elements.py b/regression/end_to_end/taint_array_from_elements/test_taint_array_from_elements.py
@@ -20,7 +20,7 @@ def test_taint_array_from_elements(load_strategy):
     to function calls.
     """
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = run_security_analyser_pipeline(
         "build",
         "rules.json",
diff --git a/regression/end_to_end/taint_array_of_wrapped/test_taint_array_of_wrapped.py b/regression/end_to_end/taint_array_of_wrapped/test_taint_array_of_wrapped.py
@@ -37,7 +37,7 @@ def test_taint_array_of_wrapped(load_strategy):
         struct @__CPROVER_primitive_taint_wrapper_int { int @__CPROVER__super; _Bool @__CPROVER_com_diffblue_security_Tainted_int; }
     """
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
diff --git a/regression/end_to_end/taint_over_downcast/test_taint_over_downcast.py b/regression/end_to_end/taint_over_downcast/test_taint_over_downcast.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_taint_over_downcast(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = run_security_analyser_pipeline(
         "build",
         "rules.json",
diff --git a/regression/end_to_end/taint_over_list/test_taint_over_list.py b/regression/end_to_end/taint_over_list/test_taint_over_list.py
@@ -11,7 +11,7 @@ def test_taint_over_list(load_strategy):
     # This test fails with the full-slicer on because it removes code from
     # ArrayList.add.
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = run_security_analyser_pipeline(
         "build",
         "rules.json",
diff --git a/regression/end_to_end/taint_over_list_models/test_taint_over_list_models.py b/regression/end_to_end/taint_over_list_models/test_taint_over_list_models.py
@@ -10,7 +10,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_taint_over_list_models(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = run_security_analyser_pipeline(
         "build",
         "rules.json",
diff --git a/regression/end_to_end/taint_two_tokens/test_taint_two_tokens.py b/regression/end_to_end/taint_two_tokens/test_taint_two_tokens.py
@@ -8,7 +8,7 @@
 @fasteners.interprocess_locked('.build_lock')
 def test_taint_two_tokens(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
diff --git a/regression/end_to_end/tainted-array-type/test_tainted_array_type.py b/regression/end_to_end/tainted-array-type/test_tainted_array_type.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_user_class(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = run_security_analyser_pipeline(
         "build",
         "rules.json",
diff --git a/regression/end_to_end/tainted-integers/test_tainted_integers.py b/regression/end_to_end/tainted-integers/test_tainted_integers.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_taint_flows_inwards(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant", "compile1"])
+        subprocess.check_call(["ant", "compile1"])
     with run_security_analyser_pipeline(
             "build_flow_in",
             "rules.json",
@@ -23,7 +23,7 @@ def test_tainted_integers_taint_flows_inwards(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_taint_flows_outwards(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant", "compile2"])
+        subprocess.check_call(["ant", "compile2"])
     with run_security_analyser_pipeline(
             "build_flow_out",
             "rules.json",
@@ -37,7 +37,7 @@ def test_tainted_integers_taint_flows_outwards(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_single_function(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant", "compile3"])
+        subprocess.check_call(["ant", "compile3"])
     with run_security_analyser_pipeline(
             "build_single_function",
             "rules.json",
@@ -51,7 +51,7 @@ def test_tainted_integers_single_function(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_taint_stored_in_array(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant", "compile4"])
+        subprocess.check_call(["ant", "compile4"])
     with run_security_analyser_pipeline(
             "build_stored_in_array",
             "rules.json",
@@ -65,7 +65,7 @@ def test_tainted_integers_taint_stored_in_array(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_taint_stored_in_fields(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant", "compile5"])
+        subprocess.check_call(["ant", "compile5"])
     with run_security_analyser_pipeline(
             "build_stored_in_fields",
             "rules.json",
@@ -79,7 +79,7 @@ def test_tainted_integers_taint_stored_in_fields(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_dependent_taint(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant", "compile6"])
+        subprocess.check_call(["ant", "compile6"])
     with run_security_analyser_pipeline(
             "build_dependent_taint",
             "rules.json",
@@ -94,7 +94,7 @@ def test_tainted_integers_dependent_taint(load_strategy):
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_integers_dependent_taint_in_summary(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant", "compile7"])
+        subprocess.check_call(["ant", "compile7"])
     with run_security_analyser_pipeline(
             "build_dependent_taint_in_summary",
             "rules.json",
diff --git a/regression/end_to_end/tainted-string-type-concat/test_tainted_string_type_concat.py b/regression/end_to_end/tainted-string-type-concat/test_tainted_string_type_concat.py
@@ -9,7 +9,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_taint_crossing_substr_and_concatenation(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = run_security_analyser_pipeline(
         "build",
         "rules.json",
diff --git a/regression/end_to_end/tainted-string-type/test_tainted_string_type.py b/regression/end_to_end/tainted-string-type/test_tainted_string_type.py
@@ -8,7 +8,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_tainted_string(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = pipeline_executor.run_security_analyser_pipeline(
         "build",
         "rules.json",
diff --git a/regression/end_to_end/tainted-user-class/test_tainted_user_class.py b/regression/end_to_end/tainted-user-class/test_tainted_user_class.py
@@ -11,7 +11,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_user_class(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant", "compile_test"])
+        subprocess.check_call(["ant", "compile_test"])
     traces = run_security_analyser_pipeline(
         "build_test",
         "rules.json",
@@ -31,7 +31,7 @@ def test_user_subclass(load_strategy):
         IF !((struct test *)anonlocal::3a)->@__CPROVER_XXX THEN GOTO 5
     """
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     traces = run_security_analyser_pipeline(
         "build_subclass",
         "subclass_rules.json",
diff --git a/regression/end_to_end/xxe01/test_xxe01.py b/regression/end_to_end/xxe01/test_xxe01.py
@@ -11,7 +11,7 @@
 @fasteners.interprocess_locked(os.path.join(os.path.dirname(__file__), ".build_lock"))
 def test_xxe01(load_strategy):
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
-        subprocess.call(["ant"])
+        subprocess.check_call(["ant"])
     with run_security_analyser_pipeline(
             "build",
             "rules.json",
diff --git a/regression/end_to_end/xxe02/test_xxe02.py b/regression/end_to_end/xxe02/test_xxe02.py
