maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge pull request #4066 from dannysepler/pathlib-in-test

Browse source 
Add pathlib in cli tests
This commit is contained in:
David Lord 2021-05-17 08:51:30 -07:00 • committed by GitHub
commit 19b905eeef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

43
tests/test_cli.py
View file

@ -5,6 +5,7 @@ import ssl
import sys import sys
import types import types
from functools import partial from functools import partial
from pathlib import Path
from unittest.mock import patch from unittest.mock import patch
import click import click
@ -29,8 +30,8 @@ from flask.cli import run_command
from flask.cli import ScriptInfo from flask.cli import ScriptInfo
from flask.cli import with_appcontext from flask.cli import with_appcontext
cwd = os.getcwd() cwd = Path.cwd()
test_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "test_apps")) test_path = (Path(__file__) / ".." / "test_apps").resolve()
@pytest.fixture @pytest.fixture
@ -152,29 +153,25 @@ def test_find_best_app(test_apps):
( (
("test", cwd, "test"), ("test", cwd, "test"),
("test.py", cwd, "test"), ("test.py", cwd, "test"),
("a/test", os.path.join(cwd, "a"), "test"), ("a/test", cwd / "a", "test"),
("test/__init__.py", cwd, "test"), ("test/__init__.py", cwd, "test"),
("test/__init__", cwd, "test"), ("test/__init__", cwd, "test"),
# nested package # nested package
( (
os.path.join(test_path, "cliapp", "inner1", "__init__"), test_path / "cliapp" / "inner1" / "__init__",
test_path, test_path,
"cliapp.inner1", "cliapp.inner1",
), ),
( (
os.path.join(test_path, "cliapp", "inner1", "inner2"), test_path / "cliapp" / "inner1" / "inner2",
test_path, test_path,
"cliapp.inner1.inner2", "cliapp.inner1.inner2",
), ),
# dotted name # dotted name
("test.a.b", cwd, "test.a.b"), ("test.a.b", cwd, "test.a.b"),
(os.path.join(test_path, "cliapp.app"), test_path, "cliapp.app"), (test_path / "cliapp.app", test_path, "cliapp.app"),
# not a Python file, will be caught during import # not a Python file, will be caught during import
( (test_path / "cliapp" / "message.txt", test_path, "cliapp.message.txt"),
os.path.join(test_path, "cliapp", "message.txt"),
test_path,
"cliapp.message.txt",
),
), ),
) )
def test_prepare_import(request, value, path, result): def test_prepare_import(request, value, path, result):
@ -193,7 +190,7 @@ def test_prepare_import(request, value, path, result):
request.addfinalizer(reset_path) request.addfinalizer(reset_path)
assert prepare_import(value) == result assert prepare_import(value) == result
assert sys.path[0] == path assert sys.path[0] == str(path)
@pytest.mark.parametrize( @pytest.mark.parametrize(
@ -278,9 +275,8 @@ def test_scriptinfo(test_apps, monkeypatch):
assert obj.load_app() is app assert obj.load_app() is app
# import app with module's absolute path # import app with module's absolute path
cli_app_path = os.path.abspath( cli_app_path = str(test_path / "cliapp" / "app.py")
os.path.join(os.path.dirname(__file__), "test_apps", "cliapp", "app.py")
)
obj = ScriptInfo(app_import_path=cli_app_path) obj = ScriptInfo(app_import_path=cli_app_path)
app = obj.load_app() app = obj.load_app()
assert app.name == "testapp" assert app.name == "testapp"
@ -302,19 +298,13 @@ def test_scriptinfo(test_apps, monkeypatch):
pytest.raises(NoAppException, obj.load_app) pytest.raises(NoAppException, obj.load_app)
# import app from wsgi.py in current directory # import app from wsgi.py in current directory
monkeypatch.chdir( monkeypatch.chdir(test_path / "helloworld")
os.path.abspath(
os.path.join(os.path.dirname(__file__), "test_apps", "helloworld")
)
)
obj = ScriptInfo() obj = ScriptInfo()
app = obj.load_app() app = obj.load_app()
assert app.name == "hello" assert app.name == "hello"
# import app from app.py in current directory # import app from app.py in current directory
monkeypatch.chdir( monkeypatch.chdir(test_path / "cliapp")
os.path.abspath(os.path.join(os.path.dirname(__file__), "test_apps", "cliapp"))
)
obj = ScriptInfo() obj = ScriptInfo()
app = obj.load_app() app = obj.load_app()
assert app.name == "testapp" assert app.name == "testapp"
@ -513,7 +503,7 @@ def test_load_dotenv(monkeypatch):
monkeypatch.setenv("EGGS", "3") monkeypatch.setenv("EGGS", "3")
monkeypatch.chdir(test_path) monkeypatch.chdir(test_path)
assert load_dotenv() assert load_dotenv()
assert os.getcwd() == test_path assert Path.cwd() == test_path
# .flaskenv doesn't overwrite .env # .flaskenv doesn't overwrite .env
assert os.environ["FOO"] == "env" assert os.environ["FOO"] == "env"
# set only in .flaskenv # set only in .flaskenv
@ -533,9 +523,8 @@ def test_dotenv_path(monkeypatch):
for item in ("FOO", "BAR", "EGGS"): for item in ("FOO", "BAR", "EGGS"):
monkeypatch._setitem.append((os.environ, item, notset)) monkeypatch._setitem.append((os.environ, item, notset))
cwd = os.getcwd() load_dotenv(test_path / ".flaskenv")
load_dotenv(os.path.join(test_path, ".flaskenv")) assert Path.cwd() == cwd
assert os.getcwd() == cwd
assert "FOO" in os.environ assert "FOO" in os.environ