python-pytest-django/pytest-django-pytest6.patch
Tomáš Chvátal d6f003cfa6 Accepting request 831464 from home:bnavigator:pytest6
- Fix test failure with pytest 6
  * pytest-django-pytest6.patch
  * The patched call signature looks weird, but it works as intended
  * Patch is part of gh#pytest-dev/pytest-django#855
- Replace deprecated py.test call with %pytest macro

OBS-URL: https://build.opensuse.org/request/show/831464
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-pytest-django?expand=0&rev=25
2020-09-02 13:27:37 +00:00

23 lines
1014 B
Diff

From 3f03d0a7890e987086042b42db346e47398ffed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20K=C3=A4ufl?= <pytest-django@c.michael-kaeufl.de>
Date: Sun, 2 Aug 2020 10:41:31 +0200
Subject: [PATCH] Fix compat with pytest 6
---
tests/test_manage_py_scan.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test_manage_py_scan.py b/tests/test_manage_py_scan.py
index 8a0f9aad..a11f87c2 100644
--- a/tests/test_manage_py_scan.py
+++ b/tests/test_manage_py_scan.py
@@ -116,7 +116,7 @@ def test_django_project_found_invalid_settings_version(django_testdir, monkeypat
"""Invalid DSM should not cause an error with --help or --version."""
monkeypatch.setenv("DJANGO_SETTINGS_MODULE", "DOES_NOT_EXIST")
- result = django_testdir.runpytest_subprocess("django_project_root", "--version")
+ result = django_testdir.runpytest_subprocess("django_project_root", "--version", "--version")
assert result.ret == 0
result.stderr.fnmatch_lines(["*This is pytest version*"])