Merge branch 'feature-1607-dgu-maintentance-refactor'

ckan · Mar 9, 2012 · 2d469c8 · 2d469c8
2 parents 8de3723 + cd37330
commit 2d469c8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ckan/tests/__init__.py b/ckan/tests/__init__.py
@@ -341,3 +341,11 @@ def skip_test(*args):
 
 def clear_flash(res=None):
     messages = _flash.pop_messages()
+
+try:
+    from nose.tools import assert_in, assert_not_in
+except ImportError:
+    def assert_in(a, b):
+        assert a in b, '%r was not in %r' % (a, b)
+    def assert_not_in(a, b):
+        assert a not in b, '%r was in %r' % (a, b)        
diff --git a/ckan/tests/lib/test_dictization.py b/ckan/tests/lib/test_dictization.py
@@ -1,4 +1,4 @@
-from nose.tools import assert_equal, assert_not_in, assert_in
+from ckan.tests import assert_equal, assert_not_in, assert_in
 from pprint import pprint, pformat
 from difflib import unified_diff