Use new XCache service names when appropriate

Author: brianhlin

osgtest/tests/test_460_stashcache.py

@@ -47,7 +47,13 @@ def setUp(self):
                                       "stashcache-cache-server",
                                       "stashcache-client",
                                       by_dependency=True)
-        self.skip_bad_unless_running("xrootd@stashcache-origin-server", "xrootd@stashcache-cache-server")
+        if core.rpm_is_installed('xcache'):
+            origin_service = "xrootd@stash-origin"
+            cache_service = "xrootd@stash-cache"
+        else:
+            origin_service = "xrootd@stashcache-origin-server"
+            cache_service = "xrootd@stashcache-cache-server"
+        self.skip_bad_unless_running(origin_service, cache_service)
 
     def test_01_create_files(self):
         xrootd_user = pwd.getpwnam("xrootd")