Merge pull request #190 from opensciencegrid/Fix-TPC-tests

added the suggestion from @matyasselmeci.

Author: efajardo

osgtest/library/service.py

@@ -36,12 +36,15 @@ def start(service_name):
     core.check_system(command, 'Start ' + service_name + ' service')
     core.state[service_name + '.started-service'] = True
 
-def check_start(service_name, timeout=10, log_to_check = None):
+def check_start(service_name, timeout=10, log_to_check = None, min_up_time=0):
     """
     Start a service, 'service_name' via init script or systemd and ensure that
-    it starts running within a 'timeout' second window (default=10s)
+    it starts running within a 'timeout' second window (default=10s).
+    Will wait 'min_up_time' seconds before checking; the timeout window starts
+    after min_up_time has been reached.
     """
     start(service_name)
+    time.sleep(min_up_time)
     assert is_running(service_name, timeout=10, log_to_check = log_to_check), "%s is not running" % service_name
 
 def stop(service_name):

osgtest/tests/test_158_xrootd_tpc.py

@@ -21,10 +21,12 @@
 if named third-party-copy-1
 set HttpPort = 9001
 macaroons.secretkey /etc/xrootd/macaroon-secret-1
+xrd.port 9001
 fi
 if named third-party-copy-2
 set HttpPort = 9002
 macaroons.secretkey /etc/xrootd/macaroon-secret-2
+xrd.port 9002
 fi
 """
 
@@ -94,9 +96,13 @@ def test_02_create_secrets(self):
                                core.config['xrootd.tpc.macaroon-secret-2'], "64"], "Creating symmetric key")
 
     def test_03_start_xrootd(self):
-        core.config['xrootd_tpc_service_1'] = "xrootd@third-party-copy-1"
-        core.config['xrootd_tpc_service_2'] = "xrootd@third-party-copy-2"
-        service.check_start(core.config['xrootd_tpc_service_1'], log_to_check = '/var/log/xrootd/third-party-copy-1/xrootd.log')
-        service.check_start(core.config['xrootd_tpc_service_2'], log_to_check = '/var/log/xrootd/third-party-copy-2/xrootd.log')
+        if core.rpm_is_installed("xrootd-multiuser"):
+            core.config['xrootd_tpc_service_1'] = "xrootd-privileged@third-party-copy-1"
+            core.config['xrootd_tpc_service_2'] = "xrootd-privileged@third-party-copy-2"
+        else:
+            core.config['xrootd_tpc_service_1'] = "xrootd@third-party-copy-1"
+            core.config['xrootd_tpc_service_2'] = "xrootd@third-party-copy-2"
+        service.check_start(core.config['xrootd_tpc_service_1'], log_to_check = '/var/log/xrootd/third-party-copy-1/xrootd.log', min_up_time = 5)
+        service.check_start(core.config['xrootd_tpc_service_2'], log_to_check = '/var/log/xrootd/third-party-copy-2/xrootd.log', min_up_time = 5)
         core.state['xrootd.started-http-server-1'] = True
         core.state['xrootd.started-http-server-2'] = True