diff --git a/tests/fixtures/list-test-case-1/package-1/setup.py b/tests/test-cases/list-1/package-1/setup.py similarity index 100% rename from tests/fixtures/list-test-case-1/package-1/setup.py rename to tests/test-cases/list-1/package-1/setup.py diff --git a/tests/fixtures/list-test-case-1/package-2/setup.py b/tests/test-cases/list-1/package-2/setup.py similarity index 100% rename from tests/fixtures/list-test-case-1/package-2/setup.py rename to tests/test-cases/list-1/package-2/setup.py diff --git a/tests/fixtures/list-test-case-1/requirements-nested.txt b/tests/test-cases/list-1/requirements-nested.txt similarity index 100% rename from tests/fixtures/list-test-case-1/requirements-nested.txt rename to tests/test-cases/list-1/requirements-nested.txt diff --git a/tests/fixtures/list-test-case-1/requirements.txt b/tests/test-cases/list-1/requirements.txt similarity index 100% rename from tests/fixtures/list-test-case-1/requirements.txt rename to tests/test-cases/list-1/requirements.txt diff --git a/tests/fixtures/requirements.txt b/tests/test-cases/requirements.txt similarity index 100% rename from tests/fixtures/requirements.txt rename to tests/test-cases/requirements.txt diff --git a/tests/fixtures/setup.py b/tests/test-cases/setup.py similarity index 100% rename from tests/fixtures/setup.py rename to tests/test-cases/setup.py diff --git a/tests/fixtures/setup_with_extras.py b/tests/test-cases/setup_with_extras.py similarity index 100% rename from tests/fixtures/setup_with_extras.py rename to tests/test-cases/setup_with_extras.py diff --git a/tests/test_list.py b/tests/test_list.py index 0409294..33bbec8 100644 --- a/tests/test_list.py +++ b/tests/test_list.py @@ -3,7 +3,7 @@ import os from pippackagelist.list import list as list_packages test_case_1_path = os.path.join( - os.path.dirname(__file__), "./fixtures/list-test-case-1" + os.path.dirname(__file__), "./test-cases/list-1" ) @@ -14,10 +14,10 @@ def test_list_from_requirements(): str(requirement) for requirement in list_packages([path]) ] assert raw_requirements == [ - "-e tests/fixtures/list-test-case-1/package-1", + "-e tests/test-cases/list-1/package-1", "django==1.1", "redis==2.0", - "-r tests/fixtures/list-test-case-1/requirements-nested.txt", + "-r tests/test-cases/list-1/requirements-nested.txt", ] @@ -30,11 +30,11 @@ def test_list_from_requirements_recurse_recursive(): ] assert raw_requirements == [ - "-e tests/fixtures/list-test-case-1/package-1", + "-e tests/test-cases/list-1/package-1", "django==1.1", "redis==2.0", "test>=1.2", - "-e tests/fixtures/list-test-case-1/package-2", + "-e tests/test-cases/list-1/package-2", ] @@ -49,7 +49,7 @@ def test_list_from_requirements_recurse_editable(): assert raw_requirements == [ "django==1.1", "redis==2.0", - "-r tests/fixtures/list-test-case-1/requirements-nested.txt", + "-r tests/test-cases/list-1/requirements-nested.txt", "pyyaml>=2.1", "grpcio==9.1", "pytest==5.2", diff --git a/tests/test_parse_requirements_txt.py b/tests/test_parse_requirements_txt.py index a425d3b..9062a45 100644 --- a/tests/test_parse_requirements_txt.py +++ b/tests/test_parse_requirements_txt.py @@ -8,7 +8,7 @@ from pippackagelist.requirements import ( from pippackagelist.requirements_txt_parser import parse_requirements_txt requirements_txt_path = os.path.join( - os.path.dirname(__file__), "./fixtures/requirements.txt" + os.path.dirname(__file__), "./test-cases/requirements.txt" ) diff --git a/tests/test_parse_setup_py.py b/tests/test_parse_setup_py.py index 803119b..b1ae9ee 100644 --- a/tests/test_parse_setup_py.py +++ b/tests/test_parse_setup_py.py @@ -7,9 +7,9 @@ from pippackagelist.requirements import ( ) from pippackagelist.setup_py_parser import parse_setup_py -setup_py_path = os.path.join(os.path.dirname(__file__), "./fixtures/setup.py") +setup_py_path = os.path.join(os.path.dirname(__file__), "./test-cases/setup.py") setup_py_with_extras_path = os.path.join( - os.path.dirname(__file__), "./fixtures/setup_with_extras.py" + os.path.dirname(__file__), "./test-cases/setup_with_extras.py" )