From f477e70b7a6875eada05475c27bc20d19587d585 Mon Sep 17 00:00:00 2001 From: Marek Trmac Date: Wed, 24 Jun 2020 14:40:07 +0200 Subject: [PATCH] Unit test fixed, path normalizes so the the test pass on windows --- pycycle/utils.py | 2 +- test_pycycle.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pycycle/utils.py b/pycycle/utils.py index 4c8394d..dcc11ad 100644 --- a/pycycle/utils.py +++ b/pycycle/utils.py @@ -148,7 +148,7 @@ def get_path_from_package_name(root, pkg): if not pkg or not root: return '' modules = pkg.split(".") - return os.path.join(root, os.sep.join(modules) + '.py') + return os.path.join(os.path.normpath(root), os.sep.join(modules) + '.py') def get_import_context(node): diff --git a/test_pycycle.py b/test_pycycle.py index 9d88bd3..c2af619 100644 --- a/test_pycycle.py +++ b/test_pycycle.py @@ -9,11 +9,11 @@ def test_get_path_from_package_name(): func = pycycle.utils.get_path_from_package_name - assert func('/test/one/two', 'some.package') == '/test/one/two/some/package.py' + assert func('/test/one/two', 'some.package') == os.path.normpath('/test/one/two/some/package.py') assert func('', 'some.package') == '' assert func('/', None) == '' assert func(None, 'some.package') == '' - assert func('/test/', 'some_package') == '/test/some_package.py' + assert func('/test/', 'some_package') == os.path.normpath('/test/some_package.py') def test_format_path(): @@ -26,7 +26,7 @@ def test_simple_project(): 'result': 'b_module -> a_module: Line 1 =>> b_module'} root_node = pycycle.utils.read_project(project['path']) - assert root_node != None + assert root_node is not None assert pycycle.utils.check_if_cycles_exist( root_node) == project['has_cycle'] assert pycycle.utils.get_cycle_path(root_node, acc=[], seen=set()) == project['result'] @@ -85,4 +85,4 @@ def test_import_context(): root_node = pycycle.utils.read_project(project['path']) assert root_node is not None assert pycycle.utils.check_if_cycles_exist( - root_node) == project['has_cycle'] \ No newline at end of file + root_node) == project['has_cycle']