Skip to content

Commit 9bafa63

Browse files
committed
Write out full XRootD sysconfig
1 parent 59ae453 commit 9bafa63

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

osgtest/tests/test_150_xrootd.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,21 @@
3131
u xrootd /tmp a
3232
"""
3333

34+
SYSCONFIG_TEXT = """\
35+
XROOTD_USER=xrootd
36+
XROOTD_GROUP=xrootd
37+
38+
XROOTD_DEFAULT_OPTIONS="-l /var/log/xrootd/xrootd.log -c /etc/xrootd/xrootd-standalone.cfg -k fifo"
39+
CMSD_DEFAULT_OPTIONS="-l /var/log/xrootd/cmsd.log -c /etc/xrootd/xrootd-standalone.cfg -k fifo"
40+
PURD_DEFAULT_OPTIONS="-l /var/log/xrootd/purged.log -c /etc/xrootd/xrootd-standalone.cfg -k fifo"
41+
XFRD_DEFAULT_OPTIONS="-l /var/log/xrootd/xfrd.log -c /etc/xrootd/xrootd-standalone.cfg -k fifo"
42+
43+
XROOTD_INSTANCES="default"
44+
CMSD_INSTANCES="default"
45+
PURD_INSTANCES="default"
46+
XFRD_INSTANCES="default"
47+
"""
48+
3449

3550
class TestStartXrootd(osgunittest.OSGTestCase):
3651

@@ -80,8 +95,7 @@ def test_01_start_xrootd(self):
8095
files.write(core.config['xrootd.config'], xrootd_config, owner='xrootd', backup=True, chmod=0o644)
8196

8297
if core.el_release() < 7:
83-
files.write(core.config['xrootd.service-defaults'],
84-
'XROOTD_DEFAULT_OPTIONS="-l /var/log/xrootd/xrootd.log -c /etc/xrootd/xrootd-standalone.cfg -k fifo"',
98+
files.write(core.config['xrootd.service-defaults'], SYSCONFIG_TEXT,
8599
owner="xrootd", chown=(user.pw_uid, user.pw_gid), chmod=0o644)
86100

87101
authfile = '/etc/xrootd/auth_file'

0 commit comments

Comments
 (0)