Skip to content

Commit 04dd326

Browse files
authored
Merge pull request #222 from brianhlin/SOFTWARE-4614.condor-multi-config-dir
Add support for multiple dirs specified in LOCAL_CONFIG_DIR
2 parents 5f0dd38 + 3276bb2 commit 04dd326

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

osgtest/tests/test_100_condor.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import re
12
from os.path import join
23

34
import osgtest.library.core as core
@@ -24,7 +25,8 @@ def test_01_start_condor(self):
2425
core.state['condor.running-service'] = True
2526
return
2627

27-
core.config['condor.personal_condor'] = join(condor.config_val('LOCAL_CONFIG_DIR'), '99-personal-condor.conf')
28+
config_dirs = re.split(r'[, ]+', condor.config_val('LOCAL_CONFIG_DIR'))
29+
core.config['condor.personal_condor'] = join(config_dirs[-1], '99-personal-condor.conf')
2830
files.write(core.config['condor.personal_condor'], personal_condor_config, owner='condor', chmod=0o644)
2931

3032
core.config['condor.collectorlog_stat'] = core.get_stat(core.config['condor.collectorlog'])

0 commit comments

Comments
 (0)