cleanup xrootd config under config.d also (SOFTWARE-3485)

Author: edquist

osgtest/tests/test_150_xrootd.py

@@ -70,7 +70,7 @@ def test_01_start_xrootd(self):
         else:
             files.write(core.config['xrootd.config-extra'],
                         XROOTD_CFG_TEXT % (sec_protocol, core.config['xrootd.port']),
-                        owner='xrootd', chmod=0o644)
+                        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))
 

osgtest/tests/test_840_xrootd.py

@@ -9,6 +9,8 @@ def test_01_stop_xrootd(self):
         if core.state['xrootd.backups-exist']:
             if core.PackageVersion('xrootd') < '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")