diff options
| -rw-r--r-- | django/test/testcases.py | 8 | ||||
| -rw-r--r-- | tests/test_utils/tests.py | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/django/test/testcases.py b/django/test/testcases.py index 8f9ba977a3..37529603be 100644 --- a/django/test/testcases.py +++ b/django/test/testcases.py @@ -1593,9 +1593,7 @@ def skipIfDBFeature(*features): def skipUnlessDBFeature(*features): """Skip a test unless a database has all the named features.""" return _deferredSkip( - lambda: not all( - getattr(connection.features, feature, False) for feature in features - ), + lambda: not all(getattr(connection.features, feature) for feature in features), "Database doesn't support feature(s): %s" % ", ".join(features), "skipUnlessDBFeature", ) @@ -1604,9 +1602,7 @@ def skipUnlessDBFeature(*features): def skipUnlessAnyDBFeature(*features): """Skip a test unless a database has any of the named features.""" return _deferredSkip( - lambda: not any( - getattr(connection.features, feature, False) for feature in features - ), + lambda: not any(getattr(connection.features, feature) for feature in features), "Database doesn't support any of the feature(s): %s" % ", ".join(features), "skipUnlessAnyDBFeature", ) diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py index e468c24727..fa2bee7870 100644 --- a/tests/test_utils/tests.py +++ b/tests/test_utils/tests.py @@ -89,9 +89,9 @@ class SkippingTestCase(SimpleTestCase): raise ValueError self._assert_skipping(test_func, ValueError) - self._assert_skipping(test_func2, unittest.SkipTest) + self._assert_skipping(test_func2, AttributeError) self._assert_skipping(test_func3, ValueError) - self._assert_skipping(test_func4, unittest.SkipTest) + self._assert_skipping(test_func4, AttributeError) class SkipTestCase(SimpleTestCase): @skipUnlessDBFeature("missing") |