From 6acb9e50ebb687b105e249296950efa5694bc0c0 Mon Sep 17 00:00:00 2001 From: vahid Date: Sat, 25 May 2019 17:20:00 -0700 Subject: [PATCH] Remove `objectstore` from its integration tests filenames. --- ...ectstore_selection_job_conf.xml => selection_job_conf.xml} | 0 ...rs_conf.xml => selection_job_resource_parameters_conf.xml} | 0 .../objectstore/{test_objectstore_jobs.py => test_jobs.py} | 0 .../{test_objectstore_selection.py => test_selection.py} | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename test/integration/objectstore/{objectstore_selection_job_conf.xml => selection_job_conf.xml} (100%) rename test/integration/objectstore/{objectstore_selection_job_resource_parameters_conf.xml => selection_job_resource_parameters_conf.xml} (100%) rename test/integration/objectstore/{test_objectstore_jobs.py => test_jobs.py} (100%) rename test/integration/objectstore/{test_objectstore_selection.py => test_selection.py} (97%) diff --git a/test/integration/objectstore/objectstore_selection_job_conf.xml b/test/integration/objectstore/selection_job_conf.xml similarity index 100% rename from test/integration/objectstore/objectstore_selection_job_conf.xml rename to test/integration/objectstore/selection_job_conf.xml diff --git a/test/integration/objectstore/objectstore_selection_job_resource_parameters_conf.xml b/test/integration/objectstore/selection_job_resource_parameters_conf.xml similarity index 100% rename from test/integration/objectstore/objectstore_selection_job_resource_parameters_conf.xml rename to test/integration/objectstore/selection_job_resource_parameters_conf.xml diff --git a/test/integration/objectstore/test_objectstore_jobs.py b/test/integration/objectstore/test_jobs.py similarity index 100% rename from test/integration/objectstore/test_objectstore_jobs.py rename to test/integration/objectstore/test_jobs.py diff --git a/test/integration/objectstore/test_objectstore_selection.py b/test/integration/objectstore/test_selection.py similarity index 97% rename from test/integration/objectstore/test_objectstore_selection.py rename to test/integration/objectstore/test_selection.py index fcbe0aedcd2..da2576ecf97 100644 --- a/test/integration/objectstore/test_objectstore_selection.py +++ b/test/integration/objectstore/test_selection.py @@ -9,8 +9,8 @@ from base.populators import ( ) SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__)) -JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "objectstore_selection_job_conf.xml") -JOB_RESOURCE_PARAMETERS_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "objectstore_selection_job_resource_parameters_conf.xml") +JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "selection_job_conf.xml") +JOB_RESOURCE_PARAMETERS_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "selection_job_resource_parameters_conf.xml") DISTRIBUTED_OBJECT_STORE_CONFIG_TEMPLATE = string.Template("""