Try xrdcp from origin and http from cache

Author: matyasselmeci

osgtest/library/files.py

@@ -237,3 +237,12 @@ def filesBackedup(path, owner):
         return True
     else:
         return False
+
+
+def safe_makedirs(directory, mode=0o777):
+    """Create a directory and all its parent directories, unless it already
+    exists.
+
+    """
+    if not os.path.isdir(directory):
+        os.makedirs(directory, mode)

osgtest/tests/test_155_stashcache.py

@@ -1,4 +1,6 @@
 import os
+import pwd
+
 from osgtest.library import core
 from osgtest.library import files
 from osgtest.library.osgunittest import OSGTestCase
@@ -126,13 +128,17 @@ def test_01_configure(self):
             ("caches_json_path", CACHES_JSON_PATH),
             ("cache_http_port", CACHE_HTTP_PORT),
             ("origin_dir", ORIGIN_DIR),
-            ("cache_dir", CACHE_DIR)
+            ("cache_dir", CACHE_DIR),
+            ("origin_port", ORIGIN_PORT)
         ]:
             _setcfg(key, val)
 
-        d = os.path.dirname(CACHES_JSON_PATH)
-        if not os.path.isdir(d):
-            os.makedirs(os.path.dirname(d))
+        xrootd_user = pwd.getpwnam("xrootd")
+        for d in [_getcfg("origin_dir"), _getcfg("cache_dir"),
+                  os.path.dirname(_getcfg("caches_json_path"))]:
+            files.safe_makedirs(d)
+            os.chown(d, xrootd_user.pw_uid, xrootd_user.pw_gid)
+
         for key, text in [
             ("cache_config_path", CACHE_CONFIG_TEXT),
             ("cache_authfile_path", CACHE_AUTHFILE_TEXT),

osgtest/tests/test_460_stashcache.py

@@ -1 +1,55 @@
-# hiii
+import os
+import pwd
+
+from osgtest.library import core
+from osgtest.library import files
+from osgtest.library.osgunittest import OSGTestCase
+from osgtest.library import service
+try:
+    from urllib2 import urlopen
+except ImportError:
+    from urllib.request import urlopen
+
+
+_NAMESPACE = "stashcache"
+
+def _getcfg(key):
+    return core.config["%s.%s" % (_NAMESPACE, key)]
+
+def _setcfg(key, val):
+    core.config["%s.%s" % (_NAMESPACE, key)] = val
+
+
+class TestStashCache(OSGTestCase):
+    _text = "this is a test"
+
+    @core.elrelease(7,8)
+    def setUp(self):
+        core.skip_ok_unless_installed("stashcache-origin-server", "stashcache-cache-server", "stashcache-client")
+        self.skip_bad_unless(service.is_running("xrootd@stashcache-origin-server"))
+        self.skip_bad_unless(service.is_running("xrootd@stashcache-cache-server"))
+
+    def test_01_create_file(self):
+        xrootd_user = pwd.getpwnam("xrootd")
+        files.write(os.path.join(_getcfg("origin_dir"), "testfile"),
+                    self._text, backup=False, chmod=0o644,
+                    chown=(xrootd_user.pw_uid, xrootd_user.pw_gid))
+
+    def test_02_fetch_from_origin(self):
+        result, _, _ = \
+            core.check_system(["xrdcp", "-d1", "-N", "-f",
+                               "root://localhost:%d//testfile" % _getcfg("origin_port"),
+                               "-"], "Checking xroot copy from origin")
+        self.assertEqual(result, self._text, "downloaded file does not match expected")
+
+    def test_03_http_fetch_from_cache(self):
+        try:
+            f = urlopen(
+                "http://localhost:%d/testfile" % _getcfg("cache_http_port")
+            )
+            result = f.read()
+        except IOError as e:
+            self.fail("Unable to download from cache via http: %s" % e)
+        self.assertEqual(result, self._text, "downloaded file does not match expected")
+        self.assertTrue(os.path.exists(os.path.join(_getcfg("cache_dir"), "testfile")),
+                        "testfile not cached")

osgtest/tests/test_835_stashcache.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 from osgtest.library import core
 from osgtest.library import files
 from osgtest.library.osgunittest import OSGTestCase
@@ -36,5 +37,7 @@ def test_03_unconfigure(self):
         ]:
             files.restore(_getcfg(key), owner=_NAMESPACE)
 
-    def test_04_clean_dirs(self):
-        pass
+    def test_04_delete_dirs(self):
+        for key in ["origin_dir", "cache_dir"]:
+            if os.path.isdir(_getcfg(key)):
+                shutil.rmtree(_getcfg(key))