# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1286564306 18000
# Node ID e830b592917b642906cc03a140be774c542ea68b
# Parent  8d36054b04ed36ae4d80da8cc8b633e68429209a
tests: fix test skipping in pure unittest

diff --git a/tests/run.py b/tests/run.py
--- a/tests/run.py
+++ b/tests/run.py
@@ -3,6 +3,9 @@ import os
 import sys
 import unittest
 
+import test_util
+test_util.SkipTest = None
+
 def tests():
     import test_binaryfiles
     import test_diff
diff --git a/tests/test_util.py b/tests/test_util.py
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -100,15 +100,17 @@ FIXTURES = os.path.join(os.path.abspath(
 
 
 def _makeskip(name, message):
-    def skip(*args, **kwargs):
-        raise SkipTest(message)
-    skip.__name__ = name
-    return skip
-
+    if SkipTest:
+        def skip(*args, **kwargs):
+            raise SkipTest(message)
+        skip.__name__ = name
+        return skip
 
 def requiresmodule(mod):
     """Skip a test if the specified module is not None."""
     def decorator(fn):
+        if fn is None:
+            return
         if mod is not None:
             return fn
         return _makeskip(fn.__name__, 'missing required feature')