Organize SiteLocalConfig test files better

cms-sw · Jan 26, 2023 · 11bcbf5 · 11bcbf5
1 parent 5510d0d
commit 11bcbf5
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 deletions.
diff --git a/FWCore/Services/test/dummycross_storage.json → ...calconfig/catalog/dummycross/storage.json b/FWCore/Services/test/dummycross_storage.json → ...calconfig/catalog/dummycross/storage.json
diff --git a/FWCore/Services/test/dummy_storage.json → ...itelocalconfig/catalog/local/storage.json b/FWCore/Services/test/dummy_storage.json → ...itelocalconfig/catalog/local/storage.json
diff --git a/...ces/test/cross-site-local-config.testfile → ...localconfig/catalog/site-local-config.xml b/...ces/test/cross-site-local-config.testfile → ...localconfig/catalog/site-local-config.xml
diff --git a/...ices/test/full-site-local-config.testfile → ...itelocalconfig/full/site-local-config.xml b/...ices/test/full-site-local-config.testfile → ...itelocalconfig/full/site-local-config.xml
diff --git a/...test/no-source-site-local-config.testfile → ...calconfig/no_source/site-local-config.xml b/...test/no-source-site-local-config.testfile → ...calconfig/no_source/site-local-config.xml
diff --git a/...es/test/source-site-local-config.testfile → ...elocalconfig/source/site-local-config.xml b/...es/test/source-site-local-config.testfile → ...elocalconfig/source/site-local-config.xml
diff --git a/...test/throwtest-site-local-config.testfile → ...telocalconfig/throw/site-local-config.xml b/...test/throwtest-site-local-config.testfile → ...telocalconfig/throw/site-local-config.xml
diff --git a/FWCore/Services/test/test_catch2_SiteLocalConfigService.cc b/FWCore/Services/test/test_catch2_SiteLocalConfigService.cc
@@ -19,9 +19,10 @@ TEST_CASE("Test SiteLocalConfigService", "[sitelocalconfig]") {
     }
   }
   REQUIRE(not dirString.empty());
-  SECTION("full-site-local-config.testfile") {
+  SECTION("sitelocalconfig/full/site-local-config.xml") {
     edm::ParameterSet pset;
-    pset.addUntrackedParameter<std::string>("siteLocalConfigFileUrl", dirString + "/full-site-local-config.testfile");
+    pset.addUntrackedParameter<std::string>("siteLocalConfigFileUrl",
+                                            dirString + "/sitelocalconfig/full/site-local-config.xml");
 
     edm::service::SiteLocalConfigService slc(pset);
 
@@ -62,7 +63,8 @@ TEST_CASE("Test SiteLocalConfigService", "[sitelocalconfig]") {
 
   SECTION("overrides") {
     edm::ParameterSet pset;
-    pset.addUntrackedParameter<std::string>("siteLocalConfigFileUrl", dirString + "/full-site-local-config.testfile");
+    pset.addUntrackedParameter<std::string>("siteLocalConfigFileUrl",
+                                            dirString + "/sitelocalconfig/full/site-local-config.xml");
 
     pset.addUntrackedParameter<std::string>("overrideSourceCacheTempDir", "/a/d");
     pset.addUntrackedParameter<double>("overrideSourceCacheMinFree", 10.);
@@ -117,10 +119,10 @@ TEST_CASE("Test SiteLocalConfigService", "[sitelocalconfig]") {
     REQUIRE(slc.localConnectSuffix() == "OverrideSuffix");
   }
 
-  SECTION("throwtest-site-local-config.testfile") {
+  SECTION("sitelocalconfig/throw/site-local-config.xml") {
     edm::ParameterSet pset;
     pset.addUntrackedParameter<std::string>("siteLocalConfigFileUrl",
-                                            dirString + "/throwtest-site-local-config.testfile");
+                                            dirString + "/sitelocalconfig/throw/site-local-config.xml");
 
     REQUIRE_THROWS_AS(edm::service::SiteLocalConfigService(pset), cms::Exception);
   }

diff --git a/FWCore/Services/test/test_sitelocalconfig.sh b/FWCore/Services/test/test_sitelocalconfig.sh
@@ -10,24 +10,24 @@ mkdir -p ${CMSSW_BASE}/test/SITECONF/DUMMY_CROSS_SITE
 
 export SITECONFIG_PATH=${CMSSW_BASE}/test/SITECONF/local
 
-cp ${LOCAL_TEST_DIR}/no-source-site-local-config.testfile ${CMSSW_BASE}/test/SITECONF/local/JobConfig/site-local-config.xml
+cp ${LOCAL_TEST_DIR}/sitelocalconfig/no_source/site-local-config.xml ${CMSSW_BASE}/test/SITECONF/local/JobConfig/
 F1=${LOCAL_TEST_DIR}/test_sitelocalconfig_no_source_cfg.py
 (cmsRun $F1 ) || die "Failure using $F1" $?
 
-cp ${LOCAL_TEST_DIR}/source-site-local-config.testfile ${CMSSW_BASE}/test/SITECONF/local/JobConfig/site-local-config.xml
+cp ${LOCAL_TEST_DIR}/sitelocalconfig/source/site-local-config.xml ${CMSSW_BASE}/test/SITECONF/local/JobConfig/
 F2=${LOCAL_TEST_DIR}/test_sitelocalconfig_source_cfg.py
 (cmsRun $F2 ) || die "Failure using $F2" $?
 
 F3=${LOCAL_TEST_DIR}/test_sitelocalconfig_override_cfg.py
 (cmsRun $F3 ) || die "Failure using $F3" $?
 
-cp ${LOCAL_TEST_DIR}/no-source-site-local-config.testfile ${CMSSW_BASE}/test/SITECONF/local/JobConfig/site-local-config.xml
+cp ${LOCAL_TEST_DIR}/sitelocalconfig/no_source/site-local-config.xml ${CMSSW_BASE}/test/SITECONF/local/JobConfig/
 F3=${LOCAL_TEST_DIR}/test_sitelocalconfig_override_cfg.py
 (cmsRun $F3 ) || die "Failure using $F3 with no-source site-local-config" $?
 
-cp ${LOCAL_TEST_DIR}/cross-site-local-config.testfile  ${CMSSW_BASE}/test/SITECONF/local/JobConfig/site-local-config.xml
-cp ${LOCAL_TEST_DIR}/dummy_storage.json ${CMSSW_BASE}/test/SITECONF/local/storage.json
-cp ${LOCAL_TEST_DIR}/dummycross_storage.json ${CMSSW_BASE}/test/SITECONF/DUMMY_CROSS_SITE/storage.json
+cp ${LOCAL_TEST_DIR}/sitelocalconfig/catalog/site-local-config.xml  ${CMSSW_BASE}/test/SITECONF/local/JobConfig/
+cp ${LOCAL_TEST_DIR}/sitelocalconfig/catalog/local/storage.json ${CMSSW_BASE}/test/SITECONF/local/
+cp ${LOCAL_TEST_DIR}/sitelocalconfig/catalog/dummycross/storage.json ${CMSSW_BASE}/test/SITECONF/DUMMY_CROSS_SITE/
 F4=${LOCAL_TEST_DIR}/test_sitelocalconfig_catalog_cfg.py
 (cmsRun $F4 ) || die "Failure using $F4" $?