File tree Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Original file line number Diff line number Diff line change 97
97
98
98
XROOTD_ORIGIN_CFG_PATH = "/etc/xrootd/xrootd-stash-origin.cfg"
99
99
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
107
100
108
101
NAMESPACE = "stashcache"
109
102
@@ -129,6 +122,11 @@ def setUp(self):
129
122
self .skip_ok_if (core .PackageVersion ("xcache" ) < "1.0.2" , "needs xcache 1.0.2+" )
130
123
131
124
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
+
132
130
for key , val in PARAMS .items ():
133
131
setcfg (key , val )
134
132
You can’t perform that action at this time.
0 commit comments