Merge pull request #284 from DUNE-DAQ/eflumerf/Issue245_MultiOutputIn…

…tegTest

Add multiple output directory configurations to multi_output_file_tes…

integtest/multi_output_file_test.py

@@ -98,8 +98,18 @@
 swtpg_conf["readout"]["enable_software_tpg"] = True
 swtpg_conf["dataflow"]["token_count"] = max(10, 3*number_of_data_producers*number_of_readout_apps)
 
-confgen_arguments={"WIBEth_System": conf_dict,
-#                   "Software_TPG_System": swtpg_conf,
+multiout_conf = copy.deepcopy(conf_dict)
+multiout_conf["dataflow"]["apps"][0]["output_paths"] = [".", "."]
+multiout_conf["dataflow"]["apps"][0]["max_file_size"] = 4*1024*1024*1024
+
+multiout_tpg_conf = copy.deepcopy(multiout_conf)
+multiout_tpg_conf["readout"]["enable_software_tpg"] = True
+multiout_tpg_conf["dataflow"]["token_count"] = max(10, 3*number_of_data_producers*number_of_readout_apps)
+
+confgen_arguments={"WIBEth_System (Rollover files)": conf_dict,
+                   #"Software_TPG_System (Rollover files)": swtpg_conf,
+                   "WIBEth_System (Multiple outputs)": multiout_conf,
+                   #"Software_TPG_System (Multiple outputs)": multiout_tpg_conf
                   }
 
 # The commands to run in nanorc, as a list
@@ -151,23 +161,25 @@ def test_data_files(run_nanorc):
             assert data_file_checks.check_fragment_sizes(data_file, fragment_check_list[jdx])
 
 def test_cleanup(run_nanorc):
-    print("============================================")
-    print("Listing the hdf5 files before deleting them:")
-    print("============================================")
     pathlist_string=""
     filelist_string=""
     for data_file in run_nanorc.data_files:
         filelist_string += " " + str(data_file)
         if str(data_file.parent) not in pathlist_string:
             pathlist_string += " " + str(data_file.parent)
 
-    os.system(f"df -h {pathlist_string}")
-    print("--------------------")
-    os.system(f"ls -alF {filelist_string}");
+    if pathlist_string and filelist_string:
+        print("============================================")
+        print("Listing the hdf5 files before deleting them:")
+        print("============================================")
 
-    for data_file in run_nanorc.data_files:
-        data_file.unlink()
+        os.system(f"df -h {pathlist_string}")
+        print("--------------------")
+        os.system(f"ls -alF {filelist_string}");
+
+        for data_file in run_nanorc.data_files:
+            data_file.unlink()
 
-    print("--------------------")
-    os.system(f"df -h {pathlist_string}")
-    print("============================================")
+        print("--------------------")
+        os.system(f"df -h {pathlist_string}")
+        print("============================================")