Skip to content

Commit d8be0ef

Browse files
committed
Show Django's version in the django report header
Fix #987
1 parent 721be6a commit d8be0ef

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

pytest_django/plugin.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,11 @@ def pytest_configure() -> None:
367367
@pytest.hookimpl()
368368
def pytest_report_header(config: pytest.Config) -> Optional[List[str]]:
369369
report_header = config.stash[report_header_key]
370+
371+
if "django" in sys.modules:
372+
import django
373+
report_header.insert(0, f"version: {django.get_version()}")
374+
370375
if report_header:
371376
return ["django: " + ", ".join(report_header)]
372377
return None

tests/test_django_configurations.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ def test_settings():
4242
)
4343
result = pytester.runpytest_subprocess()
4444
result.stdout.fnmatch_lines([
45-
'django: settings: tpkg.settings_env (from env), configuration: MySettings (from env)',
45+
"django: version: *, settings: tpkg.settings_env (from env), "
46+
"configuration: MySettings (from env)",
4647
"* 1 passed*",
4748
])
4849
assert result.ret == 0
@@ -73,7 +74,8 @@ def test_ds():
7374
)
7475
result = pytester.runpytest_subprocess()
7576
result.stdout.fnmatch_lines([
76-
'django: settings: tpkg.settings_env (from env), configuration: MySettings (from env)',
77+
"django: version: *, settings: tpkg.settings_env (from env), "
78+
"configuration: MySettings (from env)",
7779
"* 1 passed*",
7880
])
7981
assert result.ret == 0
@@ -103,7 +105,8 @@ def test_ds():
103105
)
104106
result = pytester.runpytest_subprocess()
105107
result.stdout.fnmatch_lines([
106-
'django: settings: tpkg.settings_ini (from ini), configuration: MySettings (from ini)',
108+
"django: version: *, settings: tpkg.settings_ini (from ini), "
109+
"configuration: MySettings (from ini)",
107110
"* 1 passed*",
108111
])
109112
assert result.ret == 0
@@ -134,7 +137,7 @@ def test_ds():
134137
)
135138
result = pytester.runpytest_subprocess("--ds=tpkg.settings_opt", "--dc=MySettings")
136139
result.stdout.fnmatch_lines([
137-
'django: settings: tpkg.settings_opt (from option),'
140+
'django: version: *, settings: tpkg.settings_opt (from option),'
138141
' configuration: MySettings (from option)',
139142
"* 1 passed*",
140143
])

tests/test_django_settings_module.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def test_ds():
3838
)
3939
result = pytester.runpytest_subprocess()
4040
result.stdout.fnmatch_lines([
41-
"django: settings: tpkg.settings_ini (from ini)",
41+
"django: version: *, settings: tpkg.settings_ini (from ini)",
4242
"*= 1 passed*",
4343
])
4444
assert result.ret == 0
@@ -59,7 +59,7 @@ def test_settings():
5959
)
6060
result = pytester.runpytest_subprocess()
6161
result.stdout.fnmatch_lines([
62-
"django: settings: tpkg.settings_env (from env)",
62+
"django: version: *, settings: tpkg.settings_env (from env)",
6363
"*= 1 passed*",
6464
])
6565

@@ -85,7 +85,7 @@ def test_ds():
8585
)
8686
result = pytester.runpytest_subprocess("--ds=tpkg.settings_opt")
8787
result.stdout.fnmatch_lines([
88-
"django: settings: tpkg.settings_opt (from option)",
88+
"django: version: *, settings: tpkg.settings_opt (from option)",
8989
"*= 1 passed*",
9090
])
9191

0 commit comments

Comments
 (0)