Merge pull request #178 from brianhlin/SOFTWARE-3783.xcache11

Fix tests for XCache 1.1 (SOFTWARE-3561, SOFTWARE-3783)

Author: brianhlin

osgtest/tests/test_155_stashcache.py

@@ -96,7 +96,6 @@
 """
 
 XROOTD_ORIGIN_CFG_PATH = "/etc/xrootd/xrootd-stash-origin.cfg"
-HTTP_CFG_PATH = "/etc/xrootd/config.d/40-osg-http.cfg"
 
 NAMESPACE = "stashcache"
 
@@ -123,9 +122,11 @@ def setUp(self):
 
     def test_01_configure(self):
         if core.PackageVersion('stash-cache') >= '1.1.0':
-            CACHING_PLUGIN_CFG_PATH = "/etc/xrootd/config.d/40-stash-cache-plugin.cfg"
+            caching_plugin_cfg_path = "/etc/xrootd/config.d/40-stash-cache-plugin.cfg"
+            http_cfg_path = "/etc/xrootd/config.d/50-osg-http.cfg"
         else:
-            CACHING_PLUGIN_CFG_PATH = "/etc/xrootd/config.d/40-osg-caching-plugin.cfg"
+            caching_plugin_cfg_path = "/etc/xrootd/config.d/40-osg-caching-plugin.cfg"
+            http_cfg_path = "/etc/xrootd/config.d/40-osg-http.cfg"
 
         for key, val in PARAMS.items():
             setcfg(key, val)
@@ -148,8 +149,8 @@ def test_01_configure(self):
         # Delete the lines we can't override
         for path, regexp in [
             (XROOTD_ORIGIN_CFG_PATH, "^\s*all.manager.+$"),
-            (HTTP_CFG_PATH, "^\s*xrd.protocol.+$"),
-            (CACHING_PLUGIN_CFG_PATH, "^\s*(ofs.osslib|pss.cachelib|pss.origin).+$"),
+            (http_cfg_path, "^\s*xrd.protocol.+$"),
+            (caching_plugin_cfg_path, "^\s*(ofs.osslib|pss.cachelib|pss.origin).+$"),
         ]:
             files.replace_regexpr(path, regexp, "", owner=NAMESPACE)
             filelist.append(path)