Fix/simplify existing tests

Author: blueyed

pytest_django/plugin.py

@@ -273,7 +273,7 @@ def _classmethod_is_defined_at_leaf(cls, method_name):
             break
 
     assert super_method is not None, (
-        '%s could not be found in base class' % method_name)
+        '%s could not be found in base classes' % method_name)
 
     method = getattr(cls, method_name)
 

tests/test_unittest.py

@@ -165,13 +165,12 @@ def test_bar21(self):
                     pass
         ''')
 
-        result = django_testdir.runpytest_subprocess('-v', '-s')
+        result = django_testdir.runpytest_subprocess('-v')
         result.stdout.fnmatch_lines([
-            "*TestFoo::test_shared Creating test database for*",
-            "PASSED",
-            "*TestBar::test_bar1 PASSED",
-            "*TestBar::test_shared PASSED",
-            "*TestBar2::test_bar21 PASSED",
+            "*TestFoo::test_shared PASSED*",
+            "*TestBar::test_bar1 PASSED*",
+            "*TestBar::test_shared PASSED*",
+            "*TestBar2::test_bar21 PASSED*",
             "*TestBar2::test_shared PASSED*",
         ])
         assert result.ret == 0
@@ -196,10 +195,9 @@ def test_bar(self):
                     pass
         ''')
 
-        result = django_testdir.runpytest_subprocess('-v', '-s', '--pdb')
+        result = django_testdir.runpytest_subprocess('-v')
         result.stdout.fnmatch_lines([
-            "*TestFoo::test_foo Creating test database for*",
-            "PASSED",
+            "*TestFoo::test_foo PASSED*",
             "*TestBar::test_bar PASSED*",
         ])
         assert result.ret == 0
@@ -231,13 +229,12 @@ def test_bar21(self):
                     pass
         ''')
 
-        result = django_testdir.runpytest_subprocess('-v', '-s')
+        result = django_testdir.runpytest_subprocess('-v')
         result.stdout.fnmatch_lines([
-            "*TestFoo::test_shared Creating test database for*",
-            "SKIPPED",
-            "*TestBar::test_bar1 PASSED",
-            "*TestBar::test_shared PASSED",
-            "*TestBar2::test_bar21 PASSED",
+            "*TestFoo::test_shared SKIPPED*",
+            "*TestBar::test_bar1 PASSED*",
+            "*TestBar::test_shared PASSED*",
+            "*TestBar2::test_bar21 PASSED*",
             "*TestBar2::test_shared PASSED*",
         ])
         assert result.ret == 0