diff --git a/test/integration/chained_dyndest_job_conf.xml b/test/integration/chained_dyndest_job_conf.xml index 5fc420259ed..a8d8deee901 100644 --- a/test/integration/chained_dyndest_job_conf.xml +++ b/test/integration/chained_dyndest_job_conf.xml @@ -1,16 +1,12 @@ - + integration.chained_dyndest_rules.module1 - - - - python diff --git a/test/integration/delay_job_conf.xml b/test/integration/delay_job_conf.xml index 76c68373506..cb36d405079 100644 --- a/test/integration/delay_job_conf.xml +++ b/test/integration/delay_job_conf.xml @@ -4,16 +4,12 @@ --> - + integration.delay_rules - - - - diff --git a/test/integration/dockerized_job_conf.xml b/test/integration/dockerized_job_conf.xml index 44097003630..d4cdce9f651 100644 --- a/test/integration/dockerized_job_conf.xml +++ b/test/integration/dockerized_job_conf.xml @@ -1,13 +1,9 @@ - + - - - - true diff --git a/test/integration/embedded_pulsar_job_conf.xml b/test/integration/embedded_pulsar_job_conf.xml index cabf0c79cd5..f7d08cb3347 100644 --- a/test/integration/embedded_pulsar_job_conf.xml +++ b/test/integration/embedded_pulsar_job_conf.xml @@ -2,13 +2,10 @@ - + - - - diff --git a/test/integration/embedded_pulsar_metadata_job_conf.xml b/test/integration/embedded_pulsar_metadata_job_conf.xml new file mode 100644 index 00000000000..478f19787a0 --- /dev/null +++ b/test/integration/embedded_pulsar_metadata_job_conf.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + true + copy + + + + + + diff --git a/test/integration/io_injection_job_conf.xml b/test/integration/io_injection_job_conf.xml index ebecf1652f9..4b8822777a6 100644 --- a/test/integration/io_injection_job_conf.xml +++ b/test/integration/io_injection_job_conf.xml @@ -1,18 +1,13 @@ - + - - - - - diff --git a/test/integration/objectstore_selection_job_conf.xml b/test/integration/objectstore_selection_job_conf.xml index 9973e095dea..78628a2319f 100644 --- a/test/integration/objectstore_selection_job_conf.xml +++ b/test/integration/objectstore_selection_job_conf.xml @@ -5,16 +5,12 @@ --> - + integration.objectstore_selection_rules - - - - diff --git a/test/integration/resubmission_job_conf.xml b/test/integration/resubmission_job_conf.xml index 0c43cc1935c..40f73acbc51 100644 --- a/test/integration/resubmission_job_conf.xml +++ b/test/integration/resubmission_job_conf.xml @@ -5,7 +5,7 @@ --> - + @@ -15,10 +15,6 @@ - - - - python diff --git a/test/integration/resubmission_pulsar_job_conf.xml b/test/integration/resubmission_pulsar_job_conf.xml index e7b6a1eabc7..9ee1c867ae2 100644 --- a/test/integration/resubmission_pulsar_job_conf.xml +++ b/test/integration/resubmission_pulsar_job_conf.xml @@ -1,17 +1,13 @@ - + - - - - diff --git a/test/integration/sets_tmp_dir_expression_job_conf.xml b/test/integration/sets_tmp_dir_expression_job_conf.xml index ac7e5b1b233..b4be01bda77 100644 --- a/test/integration/sets_tmp_dir_expression_job_conf.xml +++ b/test/integration/sets_tmp_dir_expression_job_conf.xml @@ -1,13 +1,9 @@ - + - - - - $(mktemp cooltmpXXXXXXXXXXXX) diff --git a/test/integration/sets_tmp_dir_to_true_job_conf.xml b/test/integration/sets_tmp_dir_to_true_job_conf.xml index e976483f389..e5ac91ef453 100644 --- a/test/integration/sets_tmp_dir_to_true_job_conf.xml +++ b/test/integration/sets_tmp_dir_to_true_job_conf.xml @@ -1,13 +1,9 @@ - + - - - - True diff --git a/test/integration/simple_job_conf.xml b/test/integration/simple_job_conf.xml index abcb0768234..568e60f79dd 100644 --- a/test/integration/simple_job_conf.xml +++ b/test/integration/simple_job_conf.xml @@ -1,13 +1,9 @@ - + - - - - diff --git a/test/integration/singularity_job_conf.xml b/test/integration/singularity_job_conf.xml index 8743b71ef7e..ccdc921727e 100644 --- a/test/integration/singularity_job_conf.xml +++ b/test/integration/singularity_job_conf.xml @@ -1,13 +1,9 @@ - + - - - - true diff --git a/test/integration/test_objectstore_jobs.py b/test/integration/test_objectstore_jobs.py index 3aed7e2944c..c1db9c522e7 100644 --- a/test/integration/test_objectstore_jobs.py +++ b/test/integration/test_objectstore_jobs.py @@ -1,4 +1,4 @@ -"""Integration tests for object stores.""" +"""Integration tests for job and object store interactions.""" import os import string @@ -8,10 +8,6 @@ from base.populators import ( DatasetPopulator, ) -SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__)) -EMBEDDED_PULSAR_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "embedded_pulsar_job_conf.xml") - - DISTRIBUTED_OBJECT_STORE_CONFIG_TEMPLATE = string.Template("""