move mock layout fixtures into conftest

scheibelp · scheibelp · commit beb9a31e5189 · 2019-03-25T14:00:44.000-07:00
diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py
@@ -435,6 +435,29 @@ def fake_fn(self):
     PackageBase.fetcher = orig_fn
 
 
+class MockLayout(object):
+    def __init__(self, root):
+        self.root = root
+
+    def path_for_spec(self, spec):
+        return '/'.join([self.root, spec.name])
+
+    def check_installed(self, spec):
+        return True
+
+
+@pytest.fixture()
+def gen_mock_layout(tmpdir):
+    # Generate a MockLayout in a temporary directory. In general the prefixes
+    # specified by MockLayout should never be written to, but this ensures
+    # that even if they are, that it causes no harm
+    def create_layout(root):
+        subroot = tmpdir.mkdir(root)
+        return MockLayout(str(subroot))
+
+    yield create_layout
+
+
 @pytest.fixture()
 def module_configuration(monkeypatch, request):
     """Reads the module configuration file from the mock ones prepared
diff --git a/lib/spack/spack/test/database.py b/lib/spack/spack/test/database.py
@@ -26,29 +26,6 @@
 pytestmark = pytest.mark.db
 
 
-class MockLayout(object):
-    def __init__(self, root):
-        self.root = root
-
-    def path_for_spec(self, spec):
-        return self.root + '/'.join(['test_upstream_root', spec.name])
-
-    def check_installed(self, spec):
-        return True
-
-
-@pytest.fixture()
-def gen_mock_layout(tmpdir):
-    # Generate a MockLayout in a temporary directory. In general the prefixes
-    # specified by MockLayout should never be written to, but this ensures
-    # that even if they are, that it causes no harm
-    def create_layout(root):
-        subroot = tmpdir.mkdir(root)
-        return MockLayout(str(subroot))
-
-    yield create_layout
-
-
 @pytest.fixture()
 def test_store(tmpdir):
     real_store = spack.store.store
diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py
@@ -10,7 +10,6 @@
 import spack.repo
 import spack.store
 from spack.spec import Spec
-from spack.test.database import gen_mock_layout  # NOQA: ignore=F401
 
 
 def test_install_and_uninstall(install_mockery, mock_fetch):
@@ -127,7 +126,7 @@ def test_installed_dependency_request_conflicts(
 
 
 def test_installed_upstream_external(
-        tmpdir_factory, install_mockery, mock_fetch, gen_mock_layout):  # NOQA: ignore=F811
+        tmpdir_factory, install_mockery, mock_fetch, gen_mock_layout):
     """Check that when a dependency package is recorded as installed in
        an upstream database that it is not reinstalled.
     """
@@ -162,7 +161,7 @@ def test_installed_upstream_external(
 
 
 def test_installed_upstream(tmpdir_factory, install_mockery, mock_fetch,
-                            gen_mock_layout):  # NOQA: ignore=F811
+                            gen_mock_layout):
     """Check that when a dependency package is recorded as installed in
        an upstream database that it is not reinstalled.
     """
