test(approval-test): avoid forbidden chars for names

GIScience · Dec 16, 2024 · 2104e73 · 2104e73
1 parent b3e8232
commit 2104e73
Show file tree

Hide file tree

Showing 21 changed files with 13 additions and 10 deletions.
diff --git a/...er_invalid[headers0-schema0].approved.txt → ...er_invalid[headers0-schema0].approved.txt b/...er_invalid[headers0-schema0].approved.txt → ...er_invalid[headers0-schema0].approved.txt
diff --git a/...er_invalid[headers1-schema1].approved.txt → ...er_invalid[headers1-schema1].approved.txt b/...er_invalid[headers1-schema1].approved.txt → ...er_invalid[headers1-schema1].approved.txt
diff --git a/..._for_topic[headers0-schema0].approved.txt → ..._for_topic[headers0-schema0].approved.txt b/..._for_topic[headers0-schema0].approved.txt → ..._for_topic[headers0-schema0].approved.txt
diff --git a/..._for_topic[headers1-schema1].approved.txt → ..._for_topic[headers1-schema1].approved.txt b/..._for_topic[headers1-schema1].approved.txt → ..._for_topic[headers1-schema1].approved.txt
diff --git a/...:test_calculate[indicator0]..approved.txt → ...-test_calculate[indicator0]..approved.txt b/...:test_calculate[indicator0]..approved.txt → ...-test_calculate[indicator0]..approved.txt
diff --git a/...:test_calculate[indicator0]..received.txt → ...-test_calculate[indicator0]..received.txt b/...:test_calculate[indicator0]..received.txt → ...-test_calculate[indicator0]..received.txt
diff --git a/...::test_calculate[indicator0].approved.txt → ...n-test_calculate[indicator0].approved.txt b/...::test_calculate[indicator0].approved.txt → ...n-test_calculate[indicator0].approved.txt
diff --git a/...:test_calculate[indicator1]..received.txt → ...-test_calculate[indicator1]..received.txt b/...:test_calculate[indicator1]..received.txt → ...-test_calculate[indicator1]..received.txt
diff --git a/...::test_calculate[indicator1].approved.txt → ...n-test_calculate[indicator1].approved.txt b/...::test_calculate[indicator1].approved.txt → ...n-test_calculate[indicator1].approved.txt
diff --git a/...description_attribute_filter.approved.txt → ...description_attribute_filter.approved.txt b/...description_attribute_filter.approved.txt → ...description_attribute_filter.approved.txt
diff --git a/...tion_attribute_keys_multiple.approved.txt → ...tion_attribute_keys_multiple.approved.txt b/...tion_attribute_keys_multiple.approved.txt → ...tion_attribute_keys_multiple.approved.txt
diff --git a/...iption_attribute_keys_single.approved.txt → ...iption_attribute_keys_single.approved.txt b/...iption_attribute_keys_single.approved.txt → ...iption_attribute_keys_single.approved.txt
diff --git a/...estCalculate::test_calculate.approved.txt → ...TestCalculate-test_calculate.approved.txt b/...estCalculate::test_calculate.approved.txt → ...TestCalculate-test_calculate.approved.txt
diff --git a/...:test_calculate_above_one_th.approved.txt → ...-test_calculate_above_one_th.approved.txt b/...:test_calculate_above_one_th.approved.txt → ...-test_calculate_above_one_th.approved.txt
diff --git a/...te_above_one_th_and_expected.approved.txt → ...te_above_one_th_and_expected.approved.txt b/...te_above_one_th_and_expected.approved.txt → ...te_above_one_th_and_expected.approved.txt
diff --git a/...st_calculate_no_intersection.approved.txt → ...st_calculate_no_intersection.approved.txt b/...st_calculate_no_intersection.approved.txt → ...st_calculate_no_intersection.approved.txt
diff --git a/..._calculate_some_intersection.approved.txt → ..._calculate_some_intersection.approved.txt b/..._calculate_some_intersection.approved.txt → ..._calculate_some_intersection.approved.txt
diff --git a/...estCalculate::test_calculate.approved.txt → ...TestCalculate-test_calculate.approved.txt b/...estCalculate::test_calculate.approved.txt → ...TestCalculate-test_calculate.approved.txt
diff --git a/...st_calculate_no_intersection.approved.txt → ...st_calculate_no_intersection.approved.txt b/...st_calculate_no_intersection.approved.txt → ...st_calculate_no_intersection.approved.txt
diff --git a/...calculate_reference_lenght_0.approved.txt → ...calculate_reference_lenght_0.approved.txt b/...calculate_reference_lenght_0.approved.txt → ...calculate_reference_lenght_0.approved.txt
diff --git a/tests/integrationtests/utils.py b/tests/integrationtests/utils.py
@@ -21,27 +21,30 @@ def __init__(self, extension=None):
         """An approval tests Namer for naming approved and received text files.
 
         These files will get stored under:
-        `tests/approval/{module}/test_file.py::TestClass::test_func[a]`
+        `tests/approval/{module}/test_file.py--TestClass--test_func[a]`
 
         This class utilizes the `PYTEST_CURRENT_TEST` environment variable, which
         consist of the nodeid and the current stage:
         `relative/path/to/test_file.py::TestClass::test_func[a] (call)`
+
+        During a pytest test session stages can be setup, teardown or call.
+        Approval tests should only be used during the call stage and therefore
+        the ` (call)` postfix is removed.
+
+        To avoid forbidden characters in system paths `::` is replaced by `-`.
         """
-        self.nodeid = os.environ["PYTEST_CURRENT_TEST"]
+        self.nodeid: Path = Path(os.environ["PYTEST_CURRENT_TEST"])
         NamerBase.__init__(self, extension)
 
-    def get_file_name(self) -> str:
+    def get_file_name(self) -> Path:
         """File name is pytest nodeid w/out directory name and pytest stage."""
-        # During a pytest test session stages can be setup, teardown or call.
-        # Approval tests should only be used during the call stage and therefore
-        # we replace the ` (call)` postfix.
-        return self.nodeid.split("/")[-1].replace(" (call)", "")
+        return Path(str(self.nodeid.name).replace(" (call)", "").replace("::", "-"))
 
     def get_directory(self) -> Path:
         """Directory is `tests/approval/{module}`."""
-        parts = self.nodeid.split("/")[:-1]
-        directory = "/".join(parts)
-        return Path(APPROVED_DIR) / directory.replace("tests/integrationtests/", "")
+        parts = self.nodeid.parent.parts
+        raw = Path(*[p for p in parts if p not in ["tests", "integrationtests"]])
+        return Path(APPROVED_DIR) / raw
 
     def get_config(self) -> dict:
         return {}