Skip to content

Commit 775d561

Browse files
committed
Add RESOURCE_LOCK to tests so they can run in parallel
1 parent cc93d9f commit 775d561

3 files changed

Lines changed: 51 additions & 0 deletions

File tree

tests/API/OVAL/unittests/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,9 @@ add_oscap_test("test_variable_in_filter.sh")
3636
add_oscap_test("test_without_syschars.sh")
3737
add_oscap_test("test_xmlns_missing.sh")
3838
add_oscap_test("test_xsinil_envv58_pid.sh")
39+
40+
set_tests_properties(
41+
"API/OVAL/unittests/test_state_check_existence.sh"
42+
"API/OVAL/unittests/test_statetype_operator.sh"
43+
PROPERTIES RESOURCE_LOCK tmp_foo_file_lock
44+
)

tests/API/XCCDF/applicability/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,10 @@ add_oscap_test("test_remediate_fix_notapplicable.sh")
77
add_oscap_test("test_remediate_fix_processing.sh")
88
add_oscap_test("test_remediate_fix_processing_ds.sh")
99
add_oscap_test("test_report_anaconda_fixes.sh")
10+
11+
set_tests_properties(
12+
"API/XCCDF/applicability/test_remediate_fix_processing_ds.sh"
13+
"API/XCCDF/applicability/test_remediate_fix_processing.sh"
14+
"API/XCCDF/applicability/test_remediate_fix_notapplicable.sh"
15+
PROPERTIES RESOURCE_LOCK test_file_lock
16+
)

tests/API/XCCDF/unittests/CMakeLists.txt

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,41 @@ add_oscap_test("test_single_line_tailoring.sh")
115115
add_oscap_test("test_reference.sh")
116116
add_oscap_test("test_remediation_bootc.sh")
117117
add_oscap_test("openscap_2289_regression.sh")
118+
119+
set_tests_properties(
120+
"API/XCCDF/unittests/test_deriving_xccdf_result_from_oval2.sh"
121+
"API/XCCDF/unittests/test_deriving_xccdf_result_from_oval_multicheck.sh"
122+
"API/XCCDF/unittests/test_deriving_xccdf_result_from_oval.sh"
123+
"API/XCCDF/unittests/test_fix_arf.sh"
124+
"API/XCCDF/unittests/test_multiple_oval_files_with_same_basename.sh"
125+
"API/XCCDF/unittests/test_xccdf_check_multi_check2.sh"
126+
"API/XCCDF/unittests/test_xccdf_check_processing_complex_priority.sh"
127+
"API/XCCDF/unittests/test_xccdf_check_processing_selector_bad.sh"
128+
"API/XCCDF/unittests/test_xccdf_selectors_cluster2.sh"
129+
"API/XCCDF/unittests/test_xccdf_selectors_cluster3.sh"
130+
PROPERTIES RESOURCE_LOCK not_executable_file
131+
)
132+
133+
set_tests_properties(
134+
"API/XCCDF/unittests/test_fix_instance.sh"
135+
"API/XCCDF/unittests/test_profile_selection_by_suffix.sh"
136+
"API/XCCDF/unittests/test_remediate_perl.sh"
137+
"API/XCCDF/unittests/test_remediate_simple.sh"
138+
"API/XCCDF/unittests/test_remediate_unresolved.sh"
139+
"API/XCCDF/unittests/test_remediation_amp_escaping.sh"
140+
"API/XCCDF/unittests/test_remediation_bad_fix.sh"
141+
"API/XCCDF/unittests/test_remediation_cdata.sh"
142+
"API/XCCDF/unittests/test_remediation_environment.sh"
143+
"API/XCCDF/unittests/test_remediation_fix_without_system.sh"
144+
"API/XCCDF/unittests/test_remediation_invalid_characters.sh"
145+
"API/XCCDF/unittests/test_remediation_simple.sh"
146+
"API/XCCDF/unittests/test_remediation_subs_plain_text_empty.sh"
147+
"API/XCCDF/unittests/test_remediation_subs_plain_text.sh"
148+
"API/XCCDF/unittests/test_remediation_subs_unresolved.sh"
149+
"API/XCCDF/unittests/test_remediation_subs_value_refine_value.sh"
150+
"API/XCCDF/unittests/test_remediation_subs_value_take_first.sh"
151+
"API/XCCDF/unittests/test_remediation_subs_value_title.sh"
152+
"API/XCCDF/unittests/test_remediation_subs_value_without_selector.sh"
153+
"API/XCCDF/unittests/test_remediation_xml_comments.sh"
154+
PROPERTIES RESOURCE_LOCK test_file_lock
155+
)

0 commit comments

Comments
 (0)