Merge pull request #52 from jurraca/test-file-names

tests: align test file names, relative path fixup
asmap · Jan 23, 2025 · 4725dce · 4725dce
2 parents 46f8ab6 + 17c99cb
commit 4725dce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/tests/merge_test.py → tests/test_merge.py b/tests/merge_test.py → tests/test_merge.py
@@ -1,6 +1,8 @@
 """
 Test merging multiple sets of networks, as if they were independent AS files.
 """
+import os
+
 from kartograf.merge import general_merge
 
 from .util.generate_data import (
@@ -37,10 +39,10 @@ def test_merge_from_fixtures(tmp_path):
     '''
     Assert that general_merge merges subnets correctly.
     '''
-
-    base_nets, base_subnet_count = __read_test_vectors("tests/data/base_file.csv")
+    data_dir = os.path.join(os.path.dirname(__file__), "data")
+    base_nets, base_subnet_count = __read_test_vectors(os.path.join(data_dir, "base_file.csv"))
     base_path = tmp_path / "base.txt"
-    extra_nets, extra_subnet_count = __read_test_vectors("tests/data/extra_file.csv")
+    extra_nets, extra_subnet_count = __read_test_vectors(os.path.join(data_dir, "extra_file.csv"))
     extra_path = tmp_path / "extra.txt"
     # write the networks to disk, generating ASNs for each network
     generate_ip_file(base_path, build_file_lines(base_nets, generate_asns(len(base_nets))))

diff --git a/tests/merge_base_class_test.py → tests/test_merge_base_class.py b/tests/merge_base_class_test.py → tests/test_merge_base_class.py
diff --git a/tests/util_test.py → tests/test_util.py b/tests/util_test.py → tests/test_util.py