Ticket #18551: 18551-2.diff

django/test/testcases.py

@@ -846 +846 @@
             transaction.leave_transaction_management(using=db)
 
 
+class CheckCondition(object):
+    """ Descriptor class for deferred condition checking """
+    def __init__(self, cond_func):
+        self.cond_func = cond_func
+    def __get__(self, obj, objtype):
+        return self.cond_func()
+
 def _deferredSkip(condition, reason):
     def decorator(test_func):
         if not (isinstance(test_func, type) and
-                issubclass(test_func, TestCase)):
+                issubclass(test_func, ut2.TestCase)):
             @wraps(test_func)
             def skip_wrapper(*args, **kwargs):
                 if condition():
                     raise ut2.SkipTest(reason)
                 return test_func(*args, **kwargs)
             test_item = skip_wrapper
+            test_item.__unittest_skip_why__ = reason
+            return test_item
         else:
-            test_item = test_func
-        test_item.__unittest_skip_why__ = reason
-        return test_item
+            # Assume a class is decorated
+            test_func.__unittest_skip__ = CheckCondition(condition)
+            test_func.__unittest_skip_why__ = reason
+            return test_func
     return decorator
 
 

tests/regressiontests/test_utils/tests.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
+from io import BytesIO
+
 from django.forms import EmailField, IntegerField
 from django.http import HttpResponse
 from django.template.loader import render_to_string
-from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
-from django.utils.unittest import skip
+from django.test import SimpleTestCase, TestCase, skipIfDBFeature, skipUnlessDBFeature
+from django.utils import unittest
 
 from .models import Person
 
@@ -21 +23 @@
         self.assertRaises(ValueError, test_func)
 
 
+class SkippingClassTestCase(TestCase):
+    def test_skip_class_unless_db_feature(self):
+        @skipUnlessDBFeature("__class__")
+        class NotSkippedTests(unittest.TestCase):
+            def test_dummy(self):
+                return
+
+        @skipIfDBFeature("__class__")
+        class SkippedTests(unittest.TestCase):
+            def test_will_be_skipped(self):
+                self.fail("We should never arrive here.")
+
+        test_suite = unittest.TestSuite()
+        test_suite.addTest(NotSkippedTests('test_dummy'))
+        test_suite.addTest(SkippedTests('test_will_be_skipped'))
+        result = unittest.TextTestRunner(stream=BytesIO()).run(test_suite)
+        self.assertEqual(result.testsRun, 2)
+        self.assertEqual(len(result.skipped), 1)
+
+
 class AssertNumQueriesTests(TestCase):
     urls = 'regressiontests.test_utils.urls'
 
@@ -458 +480 @@
         with self.assertNumQueries(0):
             super(SkippingExtraTests, self).__call__(result)
 
-    @skip("Fixture loading should not be performed for skipped tests.")
+    @unittest.skip("Fixture loading should not be performed for skipped tests.")
     def test_fixtures_are_skipped(self):
         pass