Test: Fix pytest collect in root

Signed-off-by: Jos Verlinde <[email protected]>

Author: Josverl

tests/createstubs/conftest.py

@@ -4,17 +4,5 @@
 
 UName = namedtuple("UName", ["sysname", "nodename", "release", "version", "machine"])
 
-LOCATIONS = ["board", pytest.param("minified", marks=pytest.mark.minified)]
-VARIANTS = ["createstubs", "createstubs_mem", "createstubs_db"]
 
 
-def import_variant(location: str, variant: str, minified: bool = False):
-    # sourcery skip: assign-if-exp
-    """Import the variant module and return it."""
-    if location == "minified":
-        minified = True
-    if minified:
-        mod_name = f".board.{variant}_min"
-    else:
-        mod_name = f".board.{variant}"
-    return import_module(mod_name, "stubber")  # type: ignore

tests/createstubs/createstubs_all_test.py

@@ -15,7 +15,7 @@
 except ModuleNotFoundError:
     import tomli as tomllib
 
-from conftest import LOCATIONS, VARIANTS, import_variant
+from shared import LOCATIONS, VARIANTS, import_variant
 
 pytestmark = pytest.mark.micropython
 
@@ -73,8 +73,9 @@ def test_stubber_Class_available(
 
 @pytest.mark.parametrize("variant", VARIANTS)
 @pytest.mark.parametrize("location", LOCATIONS)
-def test_stubber_info_basic(location: Any, variant: str, mock_micropython_path: Generator[str, None, None]):
-
+def test_stubber_info_basic(
+    location: Any, variant: str, mock_micropython_path: Generator[str, None, None]
+):
     createstubs = import_variant(location, variant)
     stubber = createstubs.Stubber()
     assert stubber is not None, "Can't create Stubber instance"
@@ -94,7 +95,10 @@ def test_stubber_info_basic(location: Any, variant: str, mock_micropython_path:
 @pytest.mark.parametrize("variant", VARIANTS)
 @pytest.mark.parametrize("location", LOCATIONS)
 def test_stubber_info_custom(
-    location: Any, variant: str, fx_add_minified_path: Generator[str, None, None], mock_micropython_path: Generator[str, None, None]
+    location: Any,
+    variant: str,
+    fx_add_minified_path: Generator[str, None, None],
+    mock_micropython_path: Generator[str, None, None],
 ):
     createstubs = import_variant(location, variant)
 

tests/createstubs/literal_test.py

@@ -16,7 +16,7 @@
 except ModuleNotFoundError:
     import tomli as tomllib
 
-from conftest import LOCATIONS, VARIANTS, import_variant
+from shared import LOCATIONS, VARIANTS, import_variant
 
 pytestmark = pytest.mark.micropython
 

tests/createstubs/shared.py

@@ -0,0 +1,16 @@
+import pytest
+
+LOCATIONS = ["board", pytest.param("minified", marks=pytest.mark.minified)]
+VARIANTS = ["createstubs", "createstubs_mem", "createstubs_db"]
+
+
+def import_variant(location: str, variant: str, minified: bool = False):
+    # sourcery skip: assign-if-exp
+    """Import the variant module and return it."""
+    if location == "minified":
+        minified = True
+    if minified:
+        mod_name = f".board.{variant}_min"
+    else:
+        mod_name = f".board.{variant}"
+    return import_module(mod_name, "stubber")  # type: ignore