Merge pull request #160 from brianhlin/support-xcache-1.0

Support xcache 1.0

Author: matyasselmeci

osgtest/tests/test_155_stashcache.py

@@ -118,7 +118,10 @@ def _setcfg(key, val):
 class TestStartStashCache(OSGTestCase):
     @core.elrelease(7,8)
     def setUp(self):
-        core.skip_ok_unless_installed("stashcache-origin-server", "stashcache-cache-server", "stashcache-client")
+        core.skip_ok_unless_installed("stashcache-origin-server",
+                                      "stashcache-cache-server",
+                                      "stashcache-client",
+                                      by_dependency=True)
 
     def test_01_configure(self):
         for key, val in [

osgtest/tests/test_460_stashcache.py

@@ -43,8 +43,17 @@ def skip_bad_unless_running(self, *services):
 
     @core.elrelease(7,8)
     def setUp(self):
-        core.skip_ok_unless_installed("stashcache-origin-server", "stashcache-cache-server", "stashcache-client")
-        self.skip_bad_unless_running("xrootd@stashcache-origin-server", "xrootd@stashcache-cache-server")
+        core.skip_ok_unless_installed("stashcache-origin-server",
+                                      "stashcache-cache-server",
+                                      "stashcache-client",
+                                      by_dependency=True)
+        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")

osgtest/tests/test_835_stashcache.py

@@ -20,7 +20,10 @@ def _setcfg(key, val):
 class TestStopStashCache(OSGTestCase):
     @core.elrelease(7,8)
     def setUp(self):
-        core.skip_ok_unless_installed("stashcache-origin-server", "stashcache-cache-server", "stashcache-client")
+        core.skip_ok_unless_installed("stashcache-origin-server",
+                                      "stashcache-cache-server",
+                                      "stashcache-client",
+                                      by_dependency=True)
 
     def test_01_stop_origin(self):
         service.check_stop("xrootd@stashcache-origin-server")