unittest: _disable_class_methods: fall back to bound methods

Fixes pytest-dev#624.

Author: blueyed

pytest_django/plugin.py

@@ -295,12 +295,16 @@ def _disable_class_methods(cls):
     if cls in _disabled_classmethods:
         return
 
+    # Get the classmethod object (not the resulting bound method),
+    # otherwise inheritence will be broken when restoring.
+    # But fall back to bound method in case it is None in __dict__.
+    setUpClass = cls.__dict__.get('setUpClass', cls.setUpClass)
+    tearDownClass = cls.__dict__.get('tearDownClass', cls.tearDownClass)
+
     _disabled_classmethods[cls] = (
-        # Get the classmethod object (not the resulting bound method),
-        # otherwise inheritence will be broken when restoring.
-        cls.__dict__.get('setUpClass'),
+        setUpClass,
         _classmethod_is_defined_at_leaf(cls, 'setUpClass'),
-        cls.__dict__.get('tearDownClass'),
+        tearDownClass,
         _classmethod_is_defined_at_leaf(cls, 'tearDownClass'),
     )
 

tests/test_unittest.py

@@ -337,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 in *",
+        ])
+        assert result.ret == 0
+
 
 class TestCaseWithDbFixture(TestCase):
     pytestmark = pytest.mark.usefixtures('db')