tests: fix failed matching due to django-configuration deprecation warnings

Author: bluetech

tests/test_db_access_in_repr.py

@@ -21,7 +21,7 @@ def test_via_db_fixture(db):
         "tpkg/test_the_test.py:8: ",
         'self = *RuntimeError*Database access not allowed*',
         "E   *DoesNotExist: Item matching query does not exist.",
-        "* 2 failed in *",
+        "* 2 failed*",
     ])
     assert "INTERNALERROR" not in str(result.stdout) + str(result.stderr)
     assert result.ret == 1

tests/test_db_setup.py

@@ -480,7 +480,7 @@ def test_inner_migrations():
         )
         assert result.ret == 0
         assert "Operations to perform:" not in result.stdout.str()
-        result.stdout.fnmatch_lines(["*= 1 passed in *"])
+        result.stdout.fnmatch_lines(["*= 1 passed*"])
 
     def test_migrations_run(self, django_testdir):
         testdir = django_testdir

tests/test_django_configurations.py

@@ -42,7 +42,7 @@ def test_settings():
     result = testdir.runpytest_subprocess()
     result.stdout.fnmatch_lines([
         'django: settings: tpkg.settings_env (from env), configuration: MySettings (from env)',
-        "* 1 passed in*",
+        "* 1 passed*",
     ])
     assert result.ret == 0
 
@@ -73,7 +73,7 @@ def test_ds():
     result = testdir.runpytest_subprocess()
     result.stdout.fnmatch_lines([
         'django: settings: tpkg.settings_env (from env), configuration: MySettings (from env)',
-        "* 1 passed in*",
+        "* 1 passed*",
     ])
     assert result.ret == 0
 
@@ -103,7 +103,7 @@ def test_ds():
     result = testdir.runpytest_subprocess()
     result.stdout.fnmatch_lines([
         'django: settings: tpkg.settings_ini (from ini), configuration: MySettings (from ini)',
-        "* 1 passed in*",
+        "* 1 passed*",
     ])
     assert result.ret == 0
 
@@ -135,6 +135,6 @@ def test_ds():
     result.stdout.fnmatch_lines([
         'django: settings: tpkg.settings_opt (from option),'
         ' configuration: MySettings (from option)',
-        "* 1 passed in*",
+        "* 1 passed*",
     ])
     assert result.ret == 0

tests/test_django_settings_module.py

@@ -39,7 +39,7 @@ def test_ds():
     result = testdir.runpytest_subprocess()
     result.stdout.fnmatch_lines([
         "django: settings: tpkg.settings_ini (from ini)",
-        "*= 1 passed in *",
+        "*= 1 passed*",
     ])
     assert result.ret == 0
 
@@ -60,7 +60,7 @@ def test_settings():
     result = testdir.runpytest_subprocess()
     result.stdout.fnmatch_lines([
         "django: settings: tpkg.settings_env (from env)",
-        "*= 1 passed in *",
+        "*= 1 passed*",
     ])
 
 
@@ -86,7 +86,7 @@ def test_ds():
     result = testdir.runpytest_subprocess("--ds=tpkg.settings_opt")
     result.stdout.fnmatch_lines([
         "django: settings: tpkg.settings_opt (from option)",
-        "*= 1 passed in *",
+        "*= 1 passed*",
     ])
 
 
@@ -137,7 +137,7 @@ def test_ds_after_user_conftest(testdir, monkeypatch):
     testdir.makepyfile(settings_after_conftest="SECRET_KEY='secret'")
     # testdir.makeconftest("import sys; print(sys.path)")
     result = testdir.runpytest_subprocess("-v")
-    result.stdout.fnmatch_lines(["* 1 passed in*"])
+    result.stdout.fnmatch_lines(["* 1 passed*"])
     assert result.ret == 0
 
 
@@ -225,7 +225,7 @@ def test_user_count():
     """
     )
     result = testdir.runpython(p)
-    result.stdout.fnmatch_lines(["* 4 passed in*"])
+    result.stdout.fnmatch_lines(["* 4 passed*"])
 
 
 def test_settings_in_hook(testdir, monkeypatch):
@@ -274,7 +274,7 @@ def test_settings():
     """
     )
     result = testdir.runpytest_subprocess()
-    result.stdout.fnmatch_lines(["* 1 passed in*"])
+    result.stdout.fnmatch_lines(["* 1 passed*"])
     assert result.ret == 0
 
 

tests/test_fixtures.py

@@ -564,7 +564,7 @@ class Migration(migrations.Migration):
     )
 
     result = django_testdir.runpytest_subprocess("-s")
-    result.stdout.fnmatch_lines(["* 1 passed in*"])
+    result.stdout.fnmatch_lines(["* 1 passed*"])
     assert result.ret == 0
 
 

tests/test_initialization.py

@@ -54,7 +54,7 @@ def test_ds():
             "conftest",
             "pytest_configure: conftest",
             "pytest_configure: plugin",
-            "* 1 passed in*",
+            "* 1 passed*",
         ]
     )
     assert result.ret == 0

tests/test_unittest.py

@@ -97,7 +97,7 @@ def test_bar(self):
             '>       assert 0, "trigger_error"',
             "E       AssertionError: trigger_error",
             "E       assert 0",
-            "*= 1 failed, 1 passed in *",
+            "*= 1 failed, 1 passed*",
         ]
     )
     assert result.ret == 1
@@ -399,7 +399,7 @@ def test_noop(self):
 
         result = django_testdir.runpytest_subprocess("-q", "-s")
         result.stdout.fnmatch_lines(
-            ["*FooBarTestCase.setUpClass*", "*test_noop*", "1 passed in*"]
+            ["*FooBarTestCase.setUpClass*", "*test_noop*", "1 passed*"]
         )
         assert result.ret == 0
 
@@ -484,5 +484,5 @@ def test_method(self):
     )
 
     result = django_testdir.runpytest_subprocess("--pdb")
-    result.stdout.fnmatch_lines(["*= 1 passed in *"])
+    result.stdout.fnmatch_lines(["*= 1 passed*"])
     assert result.ret == 0