Minor cleanup to the select_for_update tests (as suggested by Alex Gaynor).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16060 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 4 insertions, 8 deletions

diff --git a/tests/modeltests/select_for_update/tests.py b/tests/modeltests/select_for_update/tests.py
index 514b9e46fd..2e4eaed447 100644
--- a/tests/modeltests/select_for_update/tests.py
+++ b/tests/modeltests/select_for_update/tests.py
@@ -11,17 +11,13 @@ from django.utils import unittest
 
 from models import Person
 
+# Some tests require threading, which might not be available. So create a
+# skip-test decorator for those test functions.
 try:
     import threading
-    def requires_threading(func):
-        return func
 except ImportError:
-    # Note we can't use dummy_threading here, as our tests will actually
-    # block. We just have to skip the test completely.
-    def requires_threading(func):
-        @wraps(func)
-        def wrapped(*args, **kw):
-            raise unittest.SkipTest('threading required')
+    threading = None
+requires_threading = unittest.skipUnless(threading, 'requires threading')
 
 class SelectForUpdateTests(TransactionTestCase):