Fixed #1786: Add configurable type hints.

This adds the option of giving, in addition to the type of the default
value, hints about permissible types for configuration values.

1 files changed, 9 insertions, 8 deletions

diff --git a/tests/util.py b/tests/util.py
index df952d457..246b3728e 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -94,14 +94,15 @@ def assert_startswith(thing, prefix):
         assert False, '%r does not start with %r' % (thing, prefix)
 
 
-def assert_in(x, thing):
-    if x not in thing:
-        assert False, '%r is not in %r' % (x, thing)
-
-
-def assert_not_in(x, thing):
-    if x in thing:
-        assert False, '%r is in %r' % (x, thing)
+try:
+    from nose.tools import assert_in, assert_not_in
+except ImportError:
+    def assert_in(x, thing, msg=''):
+        if x not in thing:
+            assert False, msg or '%r is not in %r%r' % (x, thing)
+    def assert_not_in(x, thing, msg=''):
+        if x in thing:
+            assert False, msg or '%r is in %r%r' % (x, thing)
 
 
 def skip_if(condition, msg=None):