Updated the integtests to use the fixture that removes HDF5 files at the end of the integtest.

Author: Kurt Biery

integtest/3ru_1df_multirun_test.py

@@ -233,7 +233,3 @@ def test_data_files(run_dunerc):
                 data_file, fragment_check_list[jdx]
             )
     assert all_ok
-
-
-def test_cleanup(run_dunerc):
-    utility_functions.remove_hdf5_files_if_requested(run_dunerc, this_test_requests_hdf5_file_removal=False)

integtest/3ru_3df_multirun_test.py

@@ -257,7 +257,3 @@ def test_data_files(run_dunerc):
         for kdx in range(len(nontrig_fragment_check_list)):
             all_ok &= data_file_checks.check_fragment_error_flags( data_file, nontrig_fragment_check_list[kdx])
     assert all_ok
-
-
-def test_cleanup(run_dunerc):
-    utility_functions.remove_hdf5_files_if_requested(run_dunerc, this_test_requests_hdf5_file_removal=False)

integtest/disabled_tpg_test.py

@@ -186,7 +186,3 @@ def test_data_files(run_dunerc):
             )
 
     assert all_ok
-
-
-def test_cleanup(run_dunerc):
-    utility_functions.remove_hdf5_files_if_requested(run_dunerc, this_test_requests_hdf5_file_removal=False)

integtest/example_system_test.py

@@ -249,7 +249,3 @@ def test_data_files(run_dunerc):
             )
 
     assert all_ok
-
-
-def test_cleanup(run_dunerc):
-    utility_functions.remove_hdf5_files_if_requested(run_dunerc, this_test_requests_hdf5_file_removal=False)

integtest/fake_data_producer_test.py

@@ -174,7 +174,3 @@ def test_data_files(run_dunerc):
             )
 
     assert all_ok
-
-
-def test_cleanup(run_dunerc):
-    utility_functions.remove_hdf5_files_if_requested(run_dunerc, this_test_requests_hdf5_file_removal=False)

integtest/long_window_readout_test.py

@@ -93,6 +93,7 @@
 conf_dict.tpg_enabled = False
 conf_dict.n_df_apps = number_of_dataflow_apps
 conf_dict.fake_hsi_enabled = False
+conf_dict.remove_hdf5_files = True
 
 conf_dict.config_substitutions.append(
     data_classes.attribute_substitution(
@@ -220,7 +221,3 @@ def test_data_files(run_dunerc):
                 data_file, fragment_check_list[jdx]
             )
     assert all_ok, "\N{POLICE CARS REVOLVING LIGHT} One or more data file checks failed! \N{POLICE CARS REVOLVING LIGHT}"
-
-
-def test_cleanup(run_dunerc):
-    utility_functions.remove_hdf5_files_if_requested(run_dunerc, this_test_requests_hdf5_file_removal=True)

integtest/minimal_system_quick_test.py

@@ -228,7 +228,3 @@ def test_metric_files(run_dunerc):
                                                          verbosity_helper=run_dunerc.verbosity_helper)
 
     assert all_ok
-
-
-def test_cleanup(run_dunerc):
-    utility_functions.remove_hdf5_files_if_requested(run_dunerc, this_test_requests_hdf5_file_removal=False)

integtest/readout_type_scan_test.py

@@ -485,7 +485,3 @@ def test_data_files(run_dunerc):
             )
 
     assert all_ok
-
-
-def test_cleanup(run_dunerc):
-    utility_functions.remove_hdf5_files_if_requested(run_dunerc, this_test_requests_hdf5_file_removal=False)

integtest/sample_ehn1_multihost_test.py

@@ -455,12 +455,3 @@ def test_tpstream_files(run_dunerc):
                 data_file, fragment_check_list[jdx]
             )
     assert all_ok
-
-
-def test_cleanup(run_dunerc):
-    if len(computers_that_are_unreachable) > 0:
-        pytest.skip(f"One or more needed computers are unreachable ({computers_that_are_unreachable}).")
-    if not pytest_tmpdir_looks_reasonable:
-        pytest.skip("The PYTEST_DEBUG_TEMPROOT env var has not been set to point to a valid directory.")
-
-    utility_functions.remove_hdf5_files_if_requested(run_dunerc, this_test_requests_hdf5_file_removal=False)

integtest/small_footprint_quick_test.py

@@ -141,7 +141,3 @@ def test_data_files(run_dunerc):
                 data_file, fragment_check_list[jdx]
             )
     assert all_ok
-
-
-def test_cleanup(run_dunerc):
-    utility_functions.remove_hdf5_files_if_requested(run_dunerc, this_test_requests_hdf5_file_removal=False)