From 3da7212b89fc73deca1bfe8d9729c36e771502cd Mon Sep 17 00:00:00 2001 From: jurraca Date: Wed, 22 Jan 2025 09:54:01 +0000 Subject: [PATCH 1/2] rename files to align on tests/test_*.py naming --- tests/{merge_test.py => test_merge.py} | 0 tests/{merge_base_class_test.py => test_merge_base_class.py} | 0 tests/{util_test.py => test_util.py} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename tests/{merge_test.py => test_merge.py} (100%) rename tests/{merge_base_class_test.py => test_merge_base_class.py} (100%) rename tests/{util_test.py => test_util.py} (100%) diff --git a/tests/merge_test.py b/tests/test_merge.py similarity index 100% rename from tests/merge_test.py rename to tests/test_merge.py diff --git a/tests/merge_base_class_test.py b/tests/test_merge_base_class.py similarity index 100% rename from tests/merge_base_class_test.py rename to tests/test_merge_base_class.py diff --git a/tests/util_test.py b/tests/test_util.py similarity index 100% rename from tests/util_test.py rename to tests/test_util.py From 17c99cbfbedad7df2f82edfb77139aeedb4b1490 Mon Sep 17 00:00:00 2001 From: jurraca Date: Wed, 22 Jan 2025 09:54:10 +0000 Subject: [PATCH 2/2] test_merge: set data dir explicitly to handle relative paths currently the data paths are relative, and only work if running from the correct top level directory, i.e. `pytest tests/` and not running the individual test directly. Setting the path relative to the file allows us to run in either case. --- tests/test_merge.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/test_merge.py b/tests/test_merge.py index 796498e..79c2b6e 100644 --- a/tests/test_merge.py +++ b/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))))