Merge pull request #159 from edquist/SOFTWARE-3485.xrd-490-tests

use separate config.d file for xrootd >= 1:4.9.0 (SOFTWARE-3485)

Author: matyasselmeci

osgtest/tests/test_150_xrootd.py

@@ -36,6 +36,7 @@ def test_01_start_xrootd(self):
         core.config['certs.xrootdcert'] = '/etc/grid-security/xrd/xrdcert.pem'
         core.config['certs.xrootdkey'] = '/etc/grid-security/xrd/xrdkey.pem'
         core.config['xrootd.config'] = '/etc/xrootd/xrootd-clustered.cfg'
+        core.config['xrootd.config-extra'] = '/etc/xrootd/config.d/99-osg-test.cfg'
         core.config['xrootd.port'] = XROOTD_PORT
         core.config['xrootd.multiuser'] = False
         core.state['xrootd.started-server'] = False
@@ -62,9 +63,14 @@ def test_01_start_xrootd(self):
                         owner="xrootd",
                         chown=(user.pw_uid, user.pw_gid))
 
-        files.append(core.config['xrootd.config'],
-                     XROOTD_CFG_TEXT % (sec_protocol, core.config['xrootd.port']),
-                     owner='xrootd', backup=True)
+        if core.PackageVersion('xrootd') < '1:4.9.0':
+            files.append(core.config['xrootd.config'],
+                         XROOTD_CFG_TEXT % (sec_protocol, core.config['xrootd.port']),
+                         owner='xrootd', backup=True)
+        else:
+            files.write(core.config['xrootd.config-extra'],
+                        XROOTD_CFG_TEXT % (sec_protocol, core.config['xrootd.port']),
+                        owner='xrootd', backup=True, chmod=0o644)
         authfile = '/etc/xrootd/auth_file'
         files.write(authfile, AUTHFILE_TEXT, owner="xrootd", chown=(user.pw_uid, user.pw_gid))
 
@@ -73,12 +79,18 @@ def test_01_start_xrootd(self):
     def test_02_configure_hdfs(self):
         core.skip_ok_unless_installed('xrootd-hdfs')
         hdfs_config = "ofs.osslib /usr/lib64/libXrdHdfs.so"
-        files.append(core.config['xrootd.config'], hdfs_config, backup=False)
+        if core.PackageVersion('xrootd') < '1:4.9.0':
+            files.append(core.config['xrootd.config'], hdfs_config, backup=False)
+        else:
+            files.append(core.config['xrootd.config-extra'], hdfs_config, backup=False)
 
     def test_03_configure_multiuser(self):
         core.skip_ok_unless_installed('xrootd-multiuser','globus-proxy-utils', by_dependency=True)
         xrootd_multiuser_conf = "xrootd.fslib libXrdMultiuser.so default"
-        files.append(core.config['xrootd.config'], xrootd_multiuser_conf, owner='xrootd', backup=False)
+        if core.PackageVersion('xrootd') < '1:4.9.0':
+            files.append(core.config['xrootd.config'], xrootd_multiuser_conf, owner='xrootd', backup=False)
+        else:
+            files.append(core.config['xrootd.config-extra'], xrootd_multiuser_conf, owner='xrootd', backup=False)
         core.config['xrootd.multiuser'] = True
 
     def test_04_start_xrootd(self):

osgtest/tests/test_840_xrootd.py

@@ -7,7 +7,10 @@ class TestStopXrootd(osgunittest.OSGTestCase):
 
     def test_01_stop_xrootd(self):
         if core.state['xrootd.backups-exist']:
-            files.restore(core.config['xrootd.config'], "xrootd")
+            if core.PackageVersion('xrootd') < '1:4.9.0':
+                files.restore(core.config['xrootd.config'], "xrootd")
+            else:
+                files.restore(core.config['xrootd.config-extra'], "xrootd")
             files.restore('/etc/xrootd/auth_file', "xrootd")
             if not core.rpm_is_installed('xrootd-lcmaps'):
                 files.restore('/etc/grid-security/xrd/xrdmapfile', "xrootd")