Clean up last modules

Clean up modules that were migrated in
PRs: #1136, 1137, 1138, 1139, 1140

Author: ethho

tests/test_schema.py

@@ -2,10 +2,8 @@
 import pytest
 import inspect
 import datajoint as dj
-from unittest.mock import patch
 from inspect import getmembers
 from . import schema
-from . import PREFIX
 
 
 class Ephys(dj.Imported):
@@ -49,10 +47,10 @@ def schema_empty_module(schema_any, schema_empty):
 
 
 @pytest.fixture
-def schema_empty(connection_test, schema_any):
+def schema_empty(connection_test, schema_any, prefix):
     context = {**schema.LOCALS_ANY, "Ephys": Ephys}
     schema_empty = dj.Schema(
-        PREFIX + "_test1", context=context, connection=connection_test
+        prefix + "_test1", context=context, connection=connection_test
     )
     schema_empty(Ephys)
     # load the rest of the classes

tests/test_university.py

@@ -4,7 +4,7 @@
 from datajoint import DataJointError
 import datajoint as dj
 from .schema_university import *
-from . import PREFIX, schema_university
+from . import schema_university
 
 
 def _hash4(table):
@@ -32,10 +32,10 @@ def schema_uni_inactive():
 
 
 @pytest.fixture
-def schema_uni(db_creds_test, schema_uni_inactive, connection_test):
+def schema_uni(db_creds_test, schema_uni_inactive, connection_test, prefix):
     # Deferred activation
     schema_uni_inactive.activate(
-        PREFIX + "_university", connection=dj.conn(**db_creds_test)
+        prefix + "_university", connection=dj.conn(**db_creds_test)
     )
     # ---------------  Fill University -------------------
     test_data_dir = Path(__file__).parent / "data"

tests/test_update1.py

@@ -4,7 +4,6 @@
 from pathlib import Path
 import tempfile
 import datajoint as dj
-from . import PREFIX
 from datajoint import DataJointError
 
 
@@ -42,9 +41,9 @@ def mock_stores_update(tmpdir_factory):
 
 
 @pytest.fixture
-def schema_update1(connection_test):
+def schema_update1(connection_test, prefix):
     schema = dj.Schema(
-        PREFIX + "_update1", context=dict(Thing=Thing), connection=connection_test
+        prefix + "_update1", context=dict(Thing=Thing), connection=connection_test
     )
     schema(Thing)
     yield schema