Skip to content

Commit 75c43fd

Browse files
committed
Support new XCache 1.0 package names by installing by dep
1 parent 7c67817 commit 75c43fd

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

osgtest/tests/test_155_stashcache.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@ def _setcfg(key, val):
118118
class TestStartStashCache(OSGTestCase):
119119
@core.elrelease(7,8)
120120
def setUp(self):
121-
core.skip_ok_unless_installed("stashcache-origin-server", "stashcache-cache-server", "stashcache-client")
121+
core.skip_ok_unless_installed("stashcache-origin-server",
122+
"stashcache-cache-server",
123+
"stashcache-client",
124+
by_dependency=True)
122125

123126
def test_01_configure(self):
124127
for key, val in [

osgtest/tests/test_460_stashcache.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ def skip_bad_unless_running(self, *services):
4343

4444
@core.elrelease(7,8)
4545
def setUp(self):
46-
core.skip_ok_unless_installed("stashcache-origin-server", "stashcache-cache-server", "stashcache-client")
46+
core.skip_ok_unless_installed("stashcache-origin-server",
47+
"stashcache-cache-server",
48+
"stashcache-client",
49+
by_dependency=True)
4750
self.skip_bad_unless_running("xrootd@stashcache-origin-server", "xrootd@stashcache-cache-server")
4851

4952
def test_01_create_files(self):

osgtest/tests/test_835_stashcache.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ def _setcfg(key, val):
2020
class TestStopStashCache(OSGTestCase):
2121
@core.elrelease(7,8)
2222
def setUp(self):
23-
core.skip_ok_unless_installed("stashcache-origin-server", "stashcache-cache-server", "stashcache-client")
23+
core.skip_ok_unless_installed("stashcache-origin-server",
24+
"stashcache-cache-server",
25+
"stashcache-client",
26+
by_dependency=True)
2427

2528
def test_01_stop_origin(self):
2629
service.check_stop("xrootd@stashcache-origin-server")

0 commit comments

Comments
 (0)