Merge pull request #89 from tjelvar-olsson/master

Make ref_resolver.Loader more fault tolerant

Author: mr-c

schema_salad/ref_resolver.py

@@ -205,8 +205,18 @@ def __init__(self,
             self.cache = {}
 
         if session is None:
-            self.session = CacheControl(requests.Session(),
-                                   cache=FileCache(os.path.join(os.environ["HOME"], ".cache", "salad")))
+            if "HOME" in os.environ:
+                self.session = CacheControl(
+                    requests.Session(),
+                    cache=FileCache(os.path.join(os.environ["HOME"], ".cache", "salad")))
+            elif "TMP" in os.environ:
+                self.session = CacheControl(
+                    requests.Session(),
+                    cache=FileCache(os.path.join(os.environ["TMP"], ".cache", "salad")))
+            else:
+                self.session = CacheControl(
+                    requests.Session(),
+                    cache=FileCache("/tmp", ".cache", "salad"))
         else:
             self.session = session
 

schema_salad/tests/test_ref_resolver.py

@@ -0,0 +1,54 @@
+"""Test the ref_resolver module."""
+
+import shutil
+import tempfile
+
+import pytest  # type: ignore
+
+@pytest.fixture
+def tmp_dir_fixture(request):
+    d = tempfile.mkdtemp()
+
+    @request.addfinalizer
+    def teardown():
+        shutil.rmtree(d)
+    return d
+
+def test_Loader_initialisation_for_HOME_env_var(tmp_dir_fixture):
+    import os
+    from schema_salad.ref_resolver import Loader
+    from requests import Session
+
+    # Ensure HOME is set.
+    os.environ["HOME"] = tmp_dir_fixture
+
+    loader = Loader(ctx={})
+    assert isinstance(loader.session, Session)
+
+def test_Loader_initialisation_for_TMP_env_var(tmp_dir_fixture):
+    import os
+    from schema_salad.ref_resolver import Loader
+    from requests import Session
+
+    # Ensure HOME is missing.
+    if "HOME" in os.environ:
+        del os.environ["HOME"]
+    # Ensure TMP is present.
+    os.environ["TMP"] = tmp_dir_fixture
+
+    loader = Loader(ctx={})
+    assert isinstance(loader.session, Session)
+
+def test_Loader_initialisation_with_neither_TMP_HOME_set(tmp_dir_fixture):
+    import os
+    from schema_salad.ref_resolver import Loader
+    from requests import Session
+
+    # Ensure HOME is missing.
+    if "HOME" in os.environ:
+        del os.environ["HOME"]
+    if "TMP" in os.environ:
+        del os.environ["TMP"]
+
+    loader = Loader(ctx={})
+    assert isinstance(loader.session, Session)