From d8b0a56fb4c61ad6ec916e9b080b80a99e84710a 2020-03-25 18:03:25
From: Brett Smith <brettcsmith@brettcsmith.org>
Date: 2020-03-25 18:03:25
Subject: [PATCH] tests: Set a default CONSERVANCY_REPOSITORY for testing.

---

diff --git a/tests/conftest.py b/tests/conftest.py
index d82c6c9da17a16e71970f994700d6bc70fe2cea7..f6a1a3becaa797f9709e1b34fb1e0cbe0ae8a8ef 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -6,9 +6,9 @@ from . import testutil
 
 @pytest.fixture(scope='session', autouse=True)
 def clean_environment():
-    os.environ.pop('CONSERVANCY_REPOSITORY', None)
     os.environ.pop('RTAUTH', None)
     os.environ.pop('RTPASSWD', None)
     os.environ.pop('RTSERVER', None)
     os.environ.pop('RTUSER', None)
+    os.environ['CONSERVANCY_REPOSITORY'] = str(testutil.test_path('repository'))
     os.environ['HOME'] = str(testutil.test_path('userconfig'))
diff --git a/tests/test_config.py b/tests/test_config.py
index 2af8d1cd8e3f3f2e2d22117178365b21914682cd..c771ac26781c71f30b2ecb4404bd966846b13e90 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -73,13 +73,13 @@ def update_environ(**kwargs):
     _update_environ(revert)
 
 def test_repository_from_environment():
-    with update_environ(CONSERVANCY_REPOSITORY='/usr/local'):
-        config = config_mod.Config()
-        assert config.repository_path().parts == ('/', 'usr', 'local')
+    config = config_mod.Config()
+    assert config.repository_path() == testutil.test_path('repository')
 
 def test_no_repository():
-    config = config_mod.Config()
-    assert config.repository_path() is None
+    with update_environ(CONSERVANCY_REPOSITORY=None):
+        config = config_mod.Config()
+        assert config.repository_path() is None
 
 def test_no_rt_credentials():
     with update_environ(HOME=testutil.TESTS_DIR):