Skip to content

Commit 59b2221

Browse files
committed
Apparently things outside test classes run before any tests!
1 parent f6235ae commit 59b2221

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

osgtest/tests/test_155_stashcache.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,6 @@
9797

9898
XROOTD_ORIGIN_CFG_PATH = "/etc/xrootd/xrootd-stash-origin.cfg"
9999
HTTP_CFG_PATH = "/etc/xrootd/config.d/40-osg-http.cfg"
100-
try:
101-
if core.PackageVersion('stash-cache') >= '1.1.0':
102-
CACHING_PLUGIN_CFG_PATH = "/etc/xrootd/config.d/40-stash-cache-plugin.cfg"
103-
else:
104-
CACHING_PLUGIN_CFG_PATH = "/etc/xrootd/config.d/40-osg-caching-plugin.cfg"
105-
except OSError:
106-
pass # stash-cache isn't installed
107100

108101
NAMESPACE = "stashcache"
109102

@@ -129,6 +122,11 @@ def setUp(self):
129122
self.skip_ok_if(core.PackageVersion("xcache") < "1.0.2", "needs xcache 1.0.2+")
130123

131124
def test_01_configure(self):
125+
if core.PackageVersion('stash-cache') >= '1.1.0':
126+
CACHING_PLUGIN_CFG_PATH = "/etc/xrootd/config.d/40-stash-cache-plugin.cfg"
127+
else:
128+
CACHING_PLUGIN_CFG_PATH = "/etc/xrootd/config.d/40-osg-caching-plugin.cfg"
129+
132130
for key, val in PARAMS.items():
133131
setcfg(key, val)
134132

0 commit comments

Comments
 (0)