Fix another unittest regression (#624)

pytest_django/plugin.py

@@ -268,12 +268,12 @@ def _classmethod_is_defined_at_leaf(cls, method_name):
     super_method = None
 
     for base_cls in cls.__mro__[1:]:  # pragma: no branch
-        if hasattr(base_cls, method_name):
-            super_method = getattr(base_cls, method_name)
+        super_method = base_cls.__dict__.get(method_name)
+        if super_method is not None:
             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)
 
@@ -297,7 +297,7 @@ def _disable_class_methods(cls):
 
     _disabled_classmethods[cls] = (
         # Get the classmethod object (not the resulting bound method),
-        # otherwise inheritence will be broken when restoring.
+        # otherwise inheritance will be broken when restoring.
         cls.__dict__.get('setUpClass'),
         _classmethod_is_defined_at_leaf(cls, 'setUpClass'),
         cls.__dict__.get('tearDownClass'),

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
@@ -340,6 +337,34 @@ def test_pass(self):
         ])
         assert result.ret == 0
 
+    def test_setUpClass_leaf_but_not_in_dunder_dict(self, django_testdir):
+        django_testdir.create_test_module('''
+            from django.test import testcases
+
+            class CMSTestCase(testcases.TestCase):
+                pass
+
+            class FooBarTestCase(testcases.TestCase):
+
+                @classmethod
+                def setUpClass(cls):
+                    print('FooBarTestCase.setUpClass')
+                    super(FooBarTestCase, cls).setUpClass()
+
+            class TestContact(CMSTestCase, FooBarTestCase):
+
+                def test_noop(self):
+                    print('test_noop')
+        ''')
+
+        result = django_testdir.runpytest_subprocess('-q', '-s')
+        result.stdout.fnmatch_lines([
+            "*FooBarTestCase.setUpClass*",
+            "*test_noop*",
+            "1 passed*",
+        ])
+        assert result.ret == 0
+
 
 class TestCaseWithDbFixture(TestCase):
     pytestmark = pytest.mark.usefixtures('db')