diff --git a/tests/assets/default_files/default_app/api.py b/tests/assets/default_files/default_app/api.py deleted file mode 100644 index a6fc3c2..0000000 --- a/tests/assets/default_files/default_app/api.py +++ /dev/null @@ -1,8 +0,0 @@ -from fastapi import FastAPI - -app = FastAPI() - - -@app.get("/") -def app_root(): - return {"message": "single file app"} diff --git a/tests/assets/default_files/default_app_dir_app/app/api.py b/tests/assets/default_files/default_app_dir_app/app/api.py deleted file mode 100644 index a6fc3c2..0000000 --- a/tests/assets/default_files/default_app_dir_app/app/api.py +++ /dev/null @@ -1,8 +0,0 @@ -from fastapi import FastAPI - -app = FastAPI() - - -@app.get("/") -def app_root(): - return {"message": "single file app"} diff --git a/tests/assets/default_files/default_app_dir_main/app/api.py b/tests/assets/default_files/default_app_dir_main/app/api.py deleted file mode 100644 index a6fc3c2..0000000 --- a/tests/assets/default_files/default_app_dir_main/app/api.py +++ /dev/null @@ -1,8 +0,0 @@ -from fastapi import FastAPI - -app = FastAPI() - - -@app.get("/") -def app_root(): - return {"message": "single file app"} diff --git a/tests/assets/default_files/default_app_dir_main/app/app.py b/tests/assets/default_files/default_app_dir_main/app/app.py deleted file mode 100644 index a6fc3c2..0000000 --- a/tests/assets/default_files/default_app_dir_main/app/app.py +++ /dev/null @@ -1,8 +0,0 @@ -from fastapi import FastAPI - -app = FastAPI() - - -@app.get("/") -def app_root(): - return {"message": "single file app"} diff --git a/tests/assets/default_files/default_main/api.py b/tests/assets/default_files/default_main/api.py deleted file mode 100644 index a6fc3c2..0000000 --- a/tests/assets/default_files/default_main/api.py +++ /dev/null @@ -1,8 +0,0 @@ -from fastapi import FastAPI - -app = FastAPI() - - -@app.get("/") -def app_root(): - return {"message": "single file app"} diff --git a/tests/assets/default_files/default_main/app.py b/tests/assets/default_files/default_main/app.py deleted file mode 100644 index a6fc3c2..0000000 --- a/tests/assets/default_files/default_main/app.py +++ /dev/null @@ -1,8 +0,0 @@ -from fastapi import FastAPI - -app = FastAPI() - - -@app.get("/") -def app_root(): - return {"message": "single file app"} diff --git a/tests/conftest.py b/tests/conftest.py index 955fd22..2e37464 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -21,3 +21,12 @@ def setup_terminal() -> None: rich_utils.FORCE_TERMINAL = False setup_logging(terminal_width=3000) return + + +@pytest.fixture(autouse=True) +def reset_imports() -> Generator[None, None, None]: + modules = sys.modules.copy() + try: + yield + finally: + sys.modules = modules diff --git a/tests/test_cli.py b/tests/test_cli.py index 44c14d2..6f9928e 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -3,160 +3,151 @@ from pathlib import Path from unittest.mock import patch +import pytest import uvicorn from fastapi_cli.cli import app from typer.testing import CliRunner -from tests.utils import changing_dir - runner = CliRunner() assets_path = Path(__file__).parent / "assets" -def test_dev() -> None: - with changing_dir(assets_path): - with patch.object(uvicorn, "run") as mock_run: - result = runner.invoke(app, ["dev", "single_file_app.py"]) - assert result.exit_code == 0, result.output - assert mock_run.called - assert mock_run.call_args - assert mock_run.call_args.kwargs == { - "app": "single_file_app:app", - "host": "127.0.0.1", - "port": 8000, - "reload": True, - "workers": None, - "root_path": "", - "proxy_headers": True, - } - assert "Using import string single_file_app:app" in result.output - assert ( - "╭────────── FastAPI CLI - Development mode ───────────╮" in result.output - ) - assert "│ Serving at: http://127.0.0.1:8000" in result.output - assert "│ API docs: http://127.0.0.1:8000/docs" in result.output - assert "│ Running in development mode, for production use:" in result.output - assert "│ fastapi run" in result.output - - -def test_dev_args() -> None: - with changing_dir(assets_path): - with patch.object(uvicorn, "run") as mock_run: - result = runner.invoke( - app, - [ - "dev", - "single_file_app.py", - "--host", - "192.168.0.2", - "--port", - "8080", - "--no-reload", - "--root-path", - "/api", - "--app", - "api", - "--no-proxy-headers", - ], - ) - assert result.exit_code == 0, result.output - assert mock_run.called - assert mock_run.call_args - assert mock_run.call_args.kwargs == { - "app": "single_file_app:api", - "host": "192.168.0.2", - "port": 8080, - "reload": False, - "workers": None, - "root_path": "/api", - "proxy_headers": False, - } - assert "Using import string single_file_app:api" in result.output - assert ( - "╭────────── FastAPI CLI - Development mode ───────────╮" in result.output - ) - assert "│ Serving at: http://192.168.0.2:8080" in result.output - assert "│ API docs: http://192.168.0.2:8080/docs" in result.output - assert "│ Running in development mode, for production use:" in result.output - assert "│ fastapi run" in result.output - - -def test_run() -> None: - with changing_dir(assets_path): - with patch.object(uvicorn, "run") as mock_run: - result = runner.invoke(app, ["run", "single_file_app.py"]) - assert result.exit_code == 0, result.output - assert mock_run.called - assert mock_run.call_args - assert mock_run.call_args.kwargs == { - "app": "single_file_app:app", - "host": "0.0.0.0", - "port": 8000, - "reload": False, - "workers": None, - "root_path": "", - "proxy_headers": True, - } - assert "Using import string single_file_app:app" in result.output - assert ( - "╭─────────── FastAPI CLI - Production mode ───────────╮" in result.output +def test_dev(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path) + with patch.object(uvicorn, "run") as mock_run: + result = runner.invoke(app, ["dev", "single_file_app.py"]) + assert result.exit_code == 0, result.output + assert mock_run.called + assert mock_run.call_args + assert mock_run.call_args.kwargs == { + "app": "single_file_app:app", + "host": "127.0.0.1", + "port": 8000, + "reload": True, + "workers": None, + "root_path": "", + "proxy_headers": True, + } + assert "Using import string single_file_app:app" in result.output + assert "╭────────── FastAPI CLI - Development mode ───────────╮" in result.output + assert "│ Serving at: http://127.0.0.1:8000" in result.output + assert "│ API docs: http://127.0.0.1:8000/docs" in result.output + assert "│ Running in development mode, for production use:" in result.output + assert "│ fastapi run" in result.output + + +def test_dev_args(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path) + with patch.object(uvicorn, "run") as mock_run: + result = runner.invoke( + app, + [ + "dev", + "single_file_app.py", + "--host", + "192.168.0.2", + "--port", + "8080", + "--no-reload", + "--root-path", + "/api", + "--app", + "api", + "--no-proxy-headers", + ], ) - assert "│ Serving at: http://0.0.0.0:8000" in result.output - assert "│ API docs: http://0.0.0.0:8000/docs" in result.output - assert "│ Running in production mode, for development use:" in result.output - assert "│ fastapi dev" in result.output - - -def test_run_args() -> None: - with changing_dir(assets_path): - with patch.object(uvicorn, "run") as mock_run: - result = runner.invoke( - app, - [ - "run", - "single_file_app.py", - "--host", - "192.168.0.2", - "--port", - "8080", - "--no-reload", - "--workers", - "2", - "--root-path", - "/api", - "--app", - "api", - "--no-proxy-headers", - ], - ) - assert result.exit_code == 0, result.output - assert mock_run.called - assert mock_run.call_args - assert mock_run.call_args.kwargs == { - "app": "single_file_app:api", - "host": "192.168.0.2", - "port": 8080, - "reload": False, - "workers": 2, - "root_path": "/api", - "proxy_headers": False, - } - assert "Using import string single_file_app:api" in result.output - assert ( - "╭─────────── FastAPI CLI - Production mode ───────────╮" in result.output + assert result.exit_code == 0, result.output + assert mock_run.called + assert mock_run.call_args + assert mock_run.call_args.kwargs == { + "app": "single_file_app:api", + "host": "192.168.0.2", + "port": 8080, + "reload": False, + "workers": None, + "root_path": "/api", + "proxy_headers": False, + } + assert "Using import string single_file_app:api" in result.output + assert "╭────────── FastAPI CLI - Development mode ───────────╮" in result.output + assert "│ Serving at: http://192.168.0.2:8080" in result.output + assert "│ API docs: http://192.168.0.2:8080/docs" in result.output + assert "│ Running in development mode, for production use:" in result.output + assert "│ fastapi run" in result.output + + +def test_run(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path) + with patch.object(uvicorn, "run") as mock_run: + result = runner.invoke(app, ["run", "single_file_app.py"]) + assert result.exit_code == 0, result.output + assert mock_run.called + assert mock_run.call_args + assert mock_run.call_args.kwargs == { + "app": "single_file_app:app", + "host": "0.0.0.0", + "port": 8000, + "reload": False, + "workers": None, + "root_path": "", + "proxy_headers": True, + } + assert "Using import string single_file_app:app" in result.output + assert "╭─────────── FastAPI CLI - Production mode ───────────╮" in result.output + assert "│ Serving at: http://0.0.0.0:8000" in result.output + assert "│ API docs: http://0.0.0.0:8000/docs" in result.output + assert "│ Running in production mode, for development use:" in result.output + assert "│ fastapi dev" in result.output + + +def test_run_args(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path) + with patch.object(uvicorn, "run") as mock_run: + result = runner.invoke( + app, + [ + "run", + "single_file_app.py", + "--host", + "192.168.0.2", + "--port", + "8080", + "--no-reload", + "--workers", + "2", + "--root-path", + "/api", + "--app", + "api", + "--no-proxy-headers", + ], ) - assert "│ Serving at: http://192.168.0.2:8080" in result.output - assert "│ API docs: http://192.168.0.2:8080/docs" in result.output - assert "│ Running in production mode, for development use:" in result.output - assert "│ fastapi dev" in result.output - - -def test_run_error() -> None: - with changing_dir(assets_path): - result = runner.invoke(app, ["run", "non_existing_file.py"]) - assert result.exit_code == 1, result.output - assert "Path does not exist non_existing_file.py" in result.output + assert result.exit_code == 0, result.output + assert mock_run.called + assert mock_run.call_args + assert mock_run.call_args.kwargs == { + "app": "single_file_app:api", + "host": "192.168.0.2", + "port": 8080, + "reload": False, + "workers": 2, + "root_path": "/api", + "proxy_headers": False, + } + assert "Using import string single_file_app:api" in result.output + assert "╭─────────── FastAPI CLI - Production mode ───────────╮" in result.output + assert "│ Serving at: http://192.168.0.2:8080" in result.output + assert "│ API docs: http://192.168.0.2:8080/docs" in result.output + assert "│ Running in production mode, for development use:" in result.output + assert "│ fastapi dev" in result.output + + +def test_run_error(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path) + result = runner.invoke(app, ["run", "non_existing_file.py"]) + assert result.exit_code == 1, result.output + assert "Path does not exist non_existing_file.py" in result.output def test_dev_help() -> None: diff --git a/tests/test_requirements.py b/tests/test_requirements.py index bcad1b9..e00ab72 100644 --- a/tests/test_requirements.py +++ b/tests/test_requirements.py @@ -5,41 +5,33 @@ from fastapi_cli.exceptions import FastAPICLIException from typer.testing import CliRunner -from .utils import changing_dir - runner = CliRunner() assets_path = Path(__file__).parent / "assets" -def test_no_uvicorn() -> None: +def test_no_uvicorn(monkeypatch: pytest.MonkeyPatch) -> None: import fastapi_cli.cli - import uvicorn - - fastapi_cli.cli.uvicorn = None # type: ignore[attr-defined, assignment] - - with changing_dir(assets_path): - result = runner.invoke(fastapi_cli.cli.app, ["dev", "single_file_app.py"]) - assert result.exit_code == 1 - assert result.exception is not None - assert ( - "Could not import Uvicorn, try running 'pip install uvicorn'" - in result.exception.args[0] - ) - fastapi_cli.cli.uvicorn = uvicorn # type: ignore[attr-defined] + monkeypatch.setattr(fastapi_cli.cli, "uvicorn", None) + monkeypatch.chdir(assets_path) + result = runner.invoke(fastapi_cli.cli.app, ["dev", "single_file_app.py"]) + assert result.exit_code == 1 + assert result.exception is not None + assert ( + "Could not import Uvicorn, try running 'pip install uvicorn'" + in result.exception.args[0] + ) -def test_no_fastapi() -> None: +def test_no_fastapi(monkeypatch: pytest.MonkeyPatch) -> None: import fastapi_cli.discover - from fastapi import FastAPI - fastapi_cli.discover.FastAPI = None # type: ignore[attr-defined, assignment] - with changing_dir(assets_path): - with pytest.raises(FastAPICLIException) as exc_info: - get_import_string(path=Path("single_file_app.py")) - assert "Could not import FastAPI, try running 'pip install fastapi'" in str( - exc_info.value - ) + monkeypatch.setattr(fastapi_cli.discover, "FastAPI", None) + monkeypatch.chdir(assets_path) - fastapi_cli.discover.FastAPI = FastAPI # type: ignore[attr-defined] + with pytest.raises(FastAPICLIException) as exc_info: + get_import_string(path=Path("single_file_app.py")) + assert "Could not import FastAPI, try running 'pip install fastapi'" in str( + exc_info.value + ) diff --git a/tests/test_utils_default_dir.py b/tests/test_utils_default_dir.py index 2665203..571dadd 100644 --- a/tests/test_utils_default_dir.py +++ b/tests/test_utils_default_dir.py @@ -5,84 +5,48 @@ from fastapi_cli.exceptions import FastAPICLIException from pytest import CaptureFixture -from .utils import changing_dir - assets_path = Path(__file__).parent / "assets" -def test_app_dir_main(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path / "default_files" / "default_app_dir_main"): - import_string = get_import_string() - assert import_string == "app.main:app" - - captured = capsys.readouterr() - assert "Using path app/main.py" in captured.out - assert "Resolved absolute path" in captured.out - assert ( - "/tests/assets/default_files/default_app_dir_main/app/main.py" in captured.out +@pytest.mark.parametrize("prog_name", ["app", "api", "main"]) +def test_app_dir_main( + prog_name: str, + monkeypatch: pytest.MonkeyPatch, + capsys: CaptureFixture[str], +) -> None: + monkeypatch.syspath_prepend( + assets_path / "default_files" / f"default_app_dir_{prog_name}" ) - assert "Importing from" in captured.out - assert "tests/assets/default_files/default_app_dir_main" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 app" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 🐍 main.py" in captured.out - assert "Importing module app.main" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from app.main import app" in captured.out - assert "Using import string app.main:app" in captured.out + monkeypatch.chdir(assets_path / "default_files" / f"default_app_dir_{prog_name}") - -def test_app_dir_app(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path / "default_files" / "default_app_dir_app"): - import_string = get_import_string() - assert import_string == "app.app:app" + import_string = get_import_string() + assert import_string == f"app.{prog_name}:app" captured = capsys.readouterr() - assert "Using path app/app.py" in captured.out + assert f"Using path app/{prog_name}.py" in captured.out assert "Resolved absolute path" in captured.out - assert "/tests/assets/default_files/default_app_dir_app/app/app.py" in captured.out - assert "Importing from" in captured.out - assert "tests/assets/default_files/default_app_dir_app" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 app" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 🐍 app.py" in captured.out - assert "Importing module app.app" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from app.app import app" in captured.out - assert "Using import string app.app:app" in captured.out - - -def test_app_dir_api(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path / "default_files" / "default_app_dir_api"): - import_string = get_import_string() - assert import_string == "app.api:app" - - captured = capsys.readouterr() - assert "Using path app/api.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "/tests/assets/default_files/default_app_dir_api/app/api.py" in captured.out + assert ( + f"/tests/assets/default_files/default_app_dir_{prog_name}/app/{prog_name}.py" + in captured.out + ) assert "Importing from" in captured.out - assert "tests/assets/default_files/default_app_dir_api" in captured.out + assert f"tests/assets/default_files/default_app_dir_{prog_name}" in captured.out assert "╭─ Python package file structure ─╮" in captured.out assert "│ 📁 app" in captured.out assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 🐍 api.py" in captured.out - assert "Importing module app.api" in captured.out + assert f"│ └── 🐍 {prog_name}.py" in captured.out + assert f"Importing module app.{prog_name}" in captured.out assert "Found importable FastAPI app" in captured.out assert "Importable FastAPI app" in captured.out - assert "from app.api import app" in captured.out - assert "Using import string app.api:app" in captured.out + assert f"from app.{prog_name} import app" in captured.out + assert f"Using import string app.{prog_name}:app" in captured.out -def test_app_dir_non_default() -> None: - with changing_dir(assets_path / "default_files" / "default_app_dir_non_default"): - with pytest.raises(FastAPICLIException) as e: - get_import_string() - assert ( - "Could not find a default file to run, please provide an explicit path" - in e.value.args[0] - ) +def test_app_dir_non_default(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path / "default_files" / "default_app_dir_non_default") + with pytest.raises(FastAPICLIException) as e: + get_import_string() + assert ( + "Could not find a default file to run, please provide an explicit path" + in e.value.args[0] + ) diff --git a/tests/test_utils_default_file.py b/tests/test_utils_default_file.py index f5c87c8..fd5a95a 100644 --- a/tests/test_utils_default_file.py +++ b/tests/test_utils_default_file.py @@ -1,5 +1,3 @@ -import importlib -import sys from pathlib import Path import pytest @@ -7,97 +5,43 @@ from fastapi_cli.exceptions import FastAPICLIException from pytest import CaptureFixture -from .utils import changing_dir - assets_path = Path(__file__).parent / "assets" -def test_single_file_main(capsys: CaptureFixture[str]) -> None: - root_path = assets_path / "default_files" / "default_main" - old_sys_path = sys.path.copy() - with changing_dir(root_path): - sys.path.insert(0, str(root_path)) - mod = importlib.import_module("main") +@pytest.mark.parametrize("prog_name", ["api", "app", "main"]) +def test_single_file( + prog_name: str, monkeypatch: pytest.MonkeyPatch, capsys: CaptureFixture[str] +) -> None: + monkeypatch.chdir(assets_path / "default_files" / f"default_{prog_name}") - importlib.reload(mod) - import_string = get_import_string() - assert import_string == "main:app" + import_string = get_import_string() + assert import_string == f"{prog_name}:app" captured = capsys.readouterr() - assert "Using path main.py" in captured.out + assert f"Using path {prog_name}.py" in captured.out assert "Resolved absolute path" in captured.out - assert "/tests/assets/default_files/default_main/main.py" in captured.out + assert ( + f"/tests/assets/default_files/default_{prog_name}/{prog_name}.py" + in captured.out + ) assert "Importing from" in captured.out - assert "/tests/assets/default_files/default_main" in captured.out + assert f"/tests/assets/default_files/default_{prog_name}" in captured.out assert "╭─ Python module file ─╮" in captured.out - assert "│ 🐍 main.py" in captured.out - assert "Importing module main" in captured.out + assert f"│ 🐍 {prog_name}.py" in captured.out + assert f"Importing module {prog_name}" in captured.out assert "Found importable FastAPI app" in captured.out assert "Importable FastAPI app" in captured.out - assert "from main import app" in captured.out - assert "Using import string main:app" in captured.out - sys.path = old_sys_path - - -def test_single_file_app(capsys: CaptureFixture[str]) -> None: - root_path = assets_path / "default_files" / "default_app" - old_sys_path = sys.path.copy() - with changing_dir(root_path): - sys.path.insert(0, str(root_path)) - mod = importlib.import_module("app") + assert f"from {prog_name} import app" in captured.out + assert f"Using import string {prog_name}:app" in captured.out - importlib.reload(mod) - import_string = get_import_string() - assert import_string == "app:app" - - captured = capsys.readouterr() - assert "Using path app.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "/tests/assets/default_files/default_app/app.py" in captured.out - assert "Importing from" in captured.out - assert "/tests/assets/default_files/default_app" in captured.out - assert "╭─ Python module file ─╮" in captured.out - assert "│ 🐍 app.py" in captured.out - assert "Importing module app" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from app import app" in captured.out - assert "Using import string app:app" in captured.out - sys.path = old_sys_path +def test_non_default_file(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path / "default_files" / "non_default") -def test_single_file_api(capsys: CaptureFixture[str]) -> None: - root_path = assets_path / "default_files" / "default_api" - old_sys_path = sys.path.copy() - with changing_dir(root_path): - sys.path.insert(0, str(root_path)) - mod = importlib.import_module("api") - - importlib.reload(mod) - import_string = get_import_string() - assert import_string == "api:app" - - captured = capsys.readouterr() - assert "Using path api.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "/tests/assets/default_files/default_api/api.py" in captured.out - assert "Importing from" in captured.out - assert "/tests/assets/default_files/default_api" in captured.out - assert "╭─ Python module file ─╮" in captured.out - assert "│ 🐍 api.py" in captured.out - assert "Importing module api" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from api import app" in captured.out - assert "Using import string api:app" in captured.out - sys.path = old_sys_path - + with pytest.raises(FastAPICLIException) as e: + get_import_string() -def test_non_default_file(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path / "default_files" / "non_default"): - with pytest.raises(FastAPICLIException) as e: - get_import_string() - assert ( - "Could not find a default file to run, please provide an explicit path" - in e.value.args[0] - ) + assert ( + "Could not find a default file to run, please provide an explicit path" + in e.value.args[0] + ) diff --git a/tests/test_utils_package.py b/tests/test_utils_package.py index d5573db..5bd2936 100644 --- a/tests/test_utils_package.py +++ b/tests/test_utils_package.py @@ -1,248 +1,59 @@ from pathlib import Path +from typing import Optional, Union import pytest from fastapi_cli.discover import get_import_string from fastapi_cli.exceptions import FastAPICLIException from pytest import CaptureFixture -from tests.utils import changing_dir - assets_path = Path(__file__).parent / "assets" -def test_package_app_root(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path): - import_string = get_import_string(path=Path("package/mod/app.py")) - assert import_string == "package.mod.app:app" - - captured = capsys.readouterr() - assert "Using path package/mod/app.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod/app.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ ├── 🐍 __init__.py " in captured.out - assert "│ └── 🐍 app.py" in captured.out - assert "Importing module package.mod.app" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package.mod.app import app" in captured.out - assert "Using import string package.mod.app:app" in captured.out - - -def test_package_api_root(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path): - import_string = get_import_string(path=Path("package/mod/api.py")) - assert import_string == "package.mod.api:api" - - captured = capsys.readouterr() - assert "Using path package/mod/api.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod/api.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ ├── 🐍 __init__.py " in captured.out - assert "│ └── 🐍 api.py" in captured.out - assert "Importing module package.mod.api" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package.mod.api import api" in captured.out - assert "Using import string package.mod.api:api" in captured.out - - -def test_package_other_root(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path): - import_string = get_import_string(path=Path("package/mod/other.py")) - assert import_string == "package.mod.other:first_other" - - captured = capsys.readouterr() - assert "Using path package/mod/other.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod/other.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ ├── 🐍 __init__.py " in captured.out - assert "│ └── 🐍 other.py" in captured.out - assert "Importing module package.mod.other" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package.mod.other import first_other" in captured.out - assert "Using import string package.mod.other:first_other" in captured.out - - -def test_package_app_mod(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path / "package/mod"): - import_string = get_import_string(path=Path("app.py")) - assert import_string == "package.mod.app:app" - - captured = capsys.readouterr() - assert "Using path app.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod/app.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ ├── 🐍 __init__.py " in captured.out - assert "│ └── 🐍 app.py" in captured.out - assert "Importing module package.mod.app" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package.mod.app import app" in captured.out - assert "Using import string package.mod.app:app" in captured.out - - -def test_package_api_mod(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path / "package/mod"): - import_string = get_import_string(path=Path("api.py")) - assert import_string == "package.mod.api:api" - - captured = capsys.readouterr() - assert "Using path api.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod/api.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ ├── 🐍 __init__.py " in captured.out - assert "│ └── 🐍 api.py" in captured.out - assert "Importing module package.mod.api" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package.mod.api import api" in captured.out - assert "Using import string package.mod.api:api" in captured.out - - -def test_package_other_mod(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path / "package/mod"): - import_string = get_import_string(path=Path("other.py")) - assert import_string == "package.mod.other:first_other" - - captured = capsys.readouterr() - assert "Using path other.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod/other.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ ├── 🐍 __init__.py " in captured.out - assert "│ └── 🐍 other.py" in captured.out - assert "Importing module package.mod.other" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package.mod.other import first_other" in captured.out - assert "Using import string package.mod.other:first_other" in captured.out - - -def test_package_app_above(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path.parent): - import_string = get_import_string(path=Path("assets/package/mod/app.py")) - assert import_string == "package.mod.app:app" - - captured = capsys.readouterr() - assert "Using path assets/package/mod/app.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod/app.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ ├── 🐍 __init__.py " in captured.out - assert "│ └── 🐍 app.py" in captured.out - assert "Importing module package.mod.app" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package.mod.app import app" in captured.out - assert "Using import string package.mod.app:app" in captured.out - - -def test_package_api_parent(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path.parent): - import_string = get_import_string(path=Path("assets/package/mod/api.py")) - assert import_string == "package.mod.api:api" - - captured = capsys.readouterr() - assert "Using path assets/package/mod/api.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod/api.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ ├── 🐍 __init__.py " in captured.out - assert "│ └── 🐍 api.py" in captured.out - assert "Importing module package.mod.api" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package.mod.api import api" in captured.out - assert "Using import string package.mod.api:api" in captured.out - - -def test_package_other_parent(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path.parent): - import_string = get_import_string(path=Path("assets/package/mod/other.py")) - assert import_string == "package.mod.other:first_other" - - captured = capsys.readouterr() - assert "Using path assets/package/mod/other.py" in captured.out +@pytest.mark.parametrize( + ( + "chdir_path", + "import_path", + "app_name", + "expect_import_string", + ), + [ + ("package/mod", "__init__.py", None, "package.mod:app"), + ("package", "__init__.py", None, "package:app"), + ("package/mod", "../", None, "package:app"), + ("..", "assets/package", None, "package:app"), + ("", "package", "api", "package:api"), + ("..", "assets/package/mod/app.py", None, "package.mod.app:app"), + ("..", "assets/package/mod/api.py", None, "package.mod.api:api"), + ("..", "assets/package/mod/other.py", None, "package.mod.other:first_other"), + ("package/mod", "app.py", None, "package.mod.app:app"), + ("package/mod", "api.py", None, "package.mod.api:api"), + ("package/mod", "other.py", None, "package.mod.other:first_other"), + ("", "package/mod/app.py", None, "package.mod.app:app"), + ("", "package/mod/api.py", None, "package.mod.api:api"), + ("", "package/mod/other.py", None, "package.mod.other:first_other"), + ], +) +def test_package_mod_init_inside( + chdir_path: str, + import_path: Union[Path, str], + app_name: Optional[str], + expect_import_string: str, + monkeypatch: pytest.MonkeyPatch, + capsys: CaptureFixture[str], +) -> None: + monkeypatch.chdir(assets_path / chdir_path) + + import_path = Path(import_path) + import_string = get_import_string(path=Path(import_path), app_name=app_name) + assert import_string == expect_import_string + + module_name, app_name = import_string.split(":") + module_path = module_name.split(".") + + captured = capsys.readouterr() + assert f"Using path {import_path}" in captured.out assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod/other.py" in captured.out + assert f"{Path(import_path).resolve()}" in captured.out assert ( "Searching for package file structure from directories with __init__.py files" in captured.out @@ -250,206 +61,58 @@ def test_package_other_parent(capsys: CaptureFixture[str]) -> None: assert "Importing from" in captured.out assert "tests/assets" in captured.out assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ ├── 🐍 __init__.py " in captured.out - assert "│ └── 🐍 other.py" in captured.out - assert "Importing module package.mod.other" in captured.out + assert f" 📁 {module_path[0]}" in captured.out + if len(module_path) == 1: + assert " └── 🐍 __init__.py" in captured.out + else: + assert " ├── 🐍 __init__.py" in captured.out + assert f" └── 📁 {module_path[1]}" in captured.out + if import_path.name != "__init__.py": + assert " ├── 🐍 __init__.py " in captured.out + assert f" └── 🐍 {import_path.name}" in captured.out + else: + assert " └── 🐍 __init__.py " in captured.out + assert f"Importing module {module_name}" in captured.out assert "Found importable FastAPI app" in captured.out assert "Importable FastAPI app" in captured.out - assert "from package.mod.other import first_other" in captured.out - assert "Using import string package.mod.other:first_other" in captured.out + assert f"from {module_name} import {app_name}" in captured.out + assert f"Using import string {module_name}:{app_name}" in captured.out -def test_package_mod_init_inside(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path / "package/mod"): - import_string = get_import_string(path=Path("__init__.py")) - assert import_string == "package.mod:app" - - captured = capsys.readouterr() - assert "Using path __init__.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod/__init__.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ └── 🐍 __init__.py " in captured.out - assert "Importing module package.mod" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package.mod import app" in captured.out - assert "Using import string package.mod:app" in captured.out - - -def test_package_mod_dir(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path): - import_string = get_import_string(path=Path("package/mod")) - assert import_string == "package.mod:app" - - captured = capsys.readouterr() - assert "Using path package/mod" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/mod" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ ├── 🐍 __init__.py" in captured.out - assert "│ └── 📁 mod" in captured.out - assert "│ └── 🐍 __init__.py " in captured.out - assert "Importing module package.mod" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package.mod import app" in captured.out - assert "Using import string package.mod:app" in captured.out - - -def test_package_init_inside(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path / "package"): - import_string = get_import_string(path=Path("__init__.py")) - assert import_string == "package:app" - - captured = capsys.readouterr() - assert "Using path __init__.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package/__init__.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ └── 🐍 __init__.py" in captured.out - assert "Importing module package" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package import app" in captured.out - assert "Using import string package:app" in captured.out - - -def test_package_dir_inside_package(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path / "package/mod"): - import_string = get_import_string(path=Path("../")) - assert import_string == "package:app" - - captured = capsys.readouterr() - assert "Using path .." in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ └── 🐍 __init__.py" in captured.out - assert "Importing module package" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package import app" in captured.out - assert "Using import string package:app" in captured.out - - -def test_package_dir_above_package(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path.parent): - import_string = get_import_string(path=Path("assets/package")) - assert import_string == "package:app" - - captured = capsys.readouterr() - assert "Using path assets/package" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ └── 🐍 __init__.py" in captured.out - assert "Importing module package" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package import app" in captured.out - assert "Using import string package:app" in captured.out - - -def test_package_dir_explicit_app(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path): - import_string = get_import_string(path=Path("package"), app_name="api") - assert import_string == "package:api" - - captured = capsys.readouterr() - assert "Using path package" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/package" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─ Python package file structure ─╮" in captured.out - assert "│ 📁 package" in captured.out - assert "│ └── 🐍 __init__.py" in captured.out - assert "Importing module package" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from package import api" in captured.out - assert "Using import string package:api" in captured.out - - -def test_broken_package_dir(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path): - # TODO (when deprecating Python 3.8): remove ValueError - with pytest.raises((ImportError, ValueError)): - get_import_string(path=Path("broken_package/mod/app.py")) +def test_broken_package_dir( + monkeypatch: pytest.MonkeyPatch, capsys: CaptureFixture[str] +) -> None: + monkeypatch.chdir(assets_path) + # TODO (when deprecating Python 3.8): remove ValueError + with pytest.raises((ImportError, ValueError)): + get_import_string(path=Path("broken_package/mod/app.py")) captured = capsys.readouterr() assert "Import error:" in captured.out assert "Ensure all the package directories have an __init__.py file" in captured.out -def test_package_dir_no_app() -> None: - with changing_dir(assets_path): - with pytest.raises(FastAPICLIException) as e: - get_import_string(path=Path("package/core/utils.py")) - assert ( - "Could not find FastAPI app in module, try using --app" in e.value.args[0] - ) +def test_package_dir_no_app(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path) + with pytest.raises(FastAPICLIException) as e: + get_import_string(path=Path("package/core/utils.py")) + assert "Could not find FastAPI app in module, try using --app" in e.value.args[0] -def test_package_dir_object_not_an_app() -> None: - with changing_dir(assets_path): - with pytest.raises(FastAPICLIException) as e: - get_import_string( - path=Path("package/core/utils.py"), app_name="get_hello_world" - ) - assert ( - "The app name get_hello_world in package.core.utils doesn't seem to be a FastAPI app" - in e.value.args[0] +def test_package_dir_object_not_an_app(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path) + with pytest.raises(FastAPICLIException) as e: + get_import_string( + path=Path("package/core/utils.py"), app_name="get_hello_world" ) + assert ( + "The app name get_hello_world in package.core.utils doesn't seem to be a FastAPI app" + in e.value.args[0] + ) -def test_package_dir_object_app_name_not_found() -> None: - with changing_dir(assets_path): - with pytest.raises(FastAPICLIException) as e: - get_import_string(path=Path("package"), app_name="non_existent_app") - assert "Could not find app name non_existent_app in package" in e.value.args[0] +def test_package_dir_object_app_name_not_found(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path) + with pytest.raises(FastAPICLIException) as e: + get_import_string(path=Path("package"), app_name="non_existent_app") + assert "Could not find app name non_existent_app in package" in e.value.args[0] diff --git a/tests/test_utils_single_file.py b/tests/test_utils_single_file.py index 6395b32..8046971 100644 --- a/tests/test_utils_single_file.py +++ b/tests/test_utils_single_file.py @@ -1,115 +1,63 @@ from pathlib import Path +from typing import Optional import pytest from fastapi_cli.discover import get_import_string from fastapi_cli.exceptions import FastAPICLIException from pytest import CaptureFixture -from .utils import changing_dir - assets_path = Path(__file__).parent / "assets" -def test_single_file_app(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path): - import_string = get_import_string(path=Path("single_file_app.py")) - assert import_string == "single_file_app:app" - - captured = capsys.readouterr() - assert "Using path single_file_app.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "/tests/assets/single_file_app.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out +@pytest.fixture(autouse=True) +def chdir_assets(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.chdir(assets_path) + + +@pytest.mark.parametrize( + ("module_name", "app_name", "import_name"), + [ + ("app", "app", None), + ("api", "api", None), + ("other", "first_other", None), + ("other", "second_other", "second_other"), + ], +) +def test_single_file_app( + module_name: str, + app_name: str, + import_name: Optional[str], + capsys: CaptureFixture[str], +) -> None: + import_string = get_import_string( + path=Path(f"single_file_{module_name}.py"), app_name=import_name ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭── Python module file ───╮" in captured.out - assert "│ 🐍 single_file_app.py" in captured.out - assert "Importing module single_file_app" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from single_file_app import app" in captured.out - assert "Using import string single_file_app:app" in captured.out - - -def test_single_file_api(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path): - import_string = get_import_string(path=Path("single_file_api.py")) - assert import_string == "single_file_api:api" + assert import_string == f"single_file_{module_name}:{app_name}" captured = capsys.readouterr() - assert "Using path single_file_api.py" in captured.out + assert f"Using path single_file_{module_name}.py" in captured.out assert "Resolved absolute path" in captured.out - assert "tests/assets/single_file_api.py" in captured.out + assert f"/tests/assets/single_file_{module_name}.py" in captured.out assert ( "Searching for package file structure from directories with __init__.py files" in captured.out ) assert "Importing from" in captured.out assert "tests/assets" in captured.out - assert "╭── Python module file ───╮" in captured.out - assert "│ 🐍 single_file_api.py" in captured.out - assert "Importing module single_file_api" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from single_file_api import api" in captured.out - assert "Using import string single_file_api:api" in captured.out - - -def test_single_file_other(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path): - import_string = get_import_string(path=Path("single_file_other.py")) - assert import_string == "single_file_other:first_other" - - captured = capsys.readouterr() - assert "Using path single_file_other.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/single_file_other.py" in captured.out assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out + "╭─── Python module file ────╮" in captured.out + or "╭── Python module file ───╮" in captured.out ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭─── Python module file ────╮" in captured.out - assert "│ 🐍 single_file_other.py" in captured.out - assert "Importing module single_file_other" in captured.out - assert "Found importable FastAPI app" in captured.out - assert "Importable FastAPI app" in captured.out - assert "from single_file_other import first_other" in captured.out - assert "Using import string single_file_other:first_other" in captured.out - -def test_single_file_explicit_object(capsys: CaptureFixture[str]) -> None: - with changing_dir(assets_path): - import_string = get_import_string( - path=Path("single_file_app.py"), app_name="second_other" - ) - assert import_string == "single_file_app:second_other" - - captured = capsys.readouterr() - assert "Using path single_file_app.py" in captured.out - assert "Resolved absolute path" in captured.out - assert "tests/assets/single_file_app.py" in captured.out - assert ( - "Searching for package file structure from directories with __init__.py files" - in captured.out - ) - assert "Importing from" in captured.out - assert "tests/assets" in captured.out - assert "╭── Python module file ───╮" in captured.out - assert "│ 🐍 single_file_app.py" in captured.out - assert "Importing module single_file_app" in captured.out + assert f"│ 🐍 single_file_{module_name}.py" in captured.out + assert f"Importing module single_file_{module_name}" in captured.out assert "Found importable FastAPI app" in captured.out assert "Importable FastAPI app" in captured.out - assert "from single_file_app import second_other" in captured.out - assert "Using import string single_file_app:second_other" in captured.out + assert f"from single_file_{module_name} import {app_name}" in captured.out + assert f"Using import string single_file_{module_name}:{app_name}" in captured.out def test_single_non_existing_file() -> None: - with changing_dir(assets_path): - with pytest.raises(FastAPICLIException) as e: - get_import_string(path=assets_path / "non_existing.py") + with pytest.raises(FastAPICLIException) as e: + get_import_string(path=assets_path / "non_existing.py") assert "Path does not exist" in e.value.args[0] diff --git a/tests/utils.py b/tests/utils.py deleted file mode 100644 index 804454c..0000000 --- a/tests/utils.py +++ /dev/null @@ -1,14 +0,0 @@ -import os -from contextlib import contextmanager -from pathlib import Path -from typing import Generator, Union - - -@contextmanager -def changing_dir(directory: Union[str, Path]) -> Generator[None, None, None]: - initial_dir = os.getcwd() - os.chdir(directory) - try: - yield - finally: - os.chdir(initial_dir)