Merge pull request #786 from dimitri-yatsenko/master

Test fixes

Author: guzman-raphael

tests/test_fetch_same.py

@@ -1,12 +1,7 @@
-from nose.tools import assert_true, assert_false, assert_equal, \
-                        assert_list_equal, raises
+from nose.tools import assert_equal
 from . import PREFIX, CONN_INFO
 import numpy as np
-import importlib
-try:
-    dj = importlib.import_module('datajoint-python.datajoint', None)
-except:
-    import datajoint as dj
+import datajoint as dj
 
 schema = dj.Schema(PREFIX + '_fetch_same', connection=dj.conn(**CONN_INFO))
 
@@ -22,13 +17,15 @@ class ProjData(dj.Manual):
     blah : varchar(10)
     """
 
-ProjData().insert([
-    {'id': 0, 'resp': 20.33, 'sim': 45.324, 'big': 3, 'blah': 'yes'},
-    {'id': 1, 'resp': 94.3, 'sim': 34.23,
-        'big': {'key1': np.random.randn(20, 10)}, 'blah': 'si'},
-    {'id': 2, 'resp': 1.90, 'sim': 10.23,
-        'big': np.random.randn(4, 2), 'blah': 'sim'}
-])
+
+with dj.config(enable_python_native_blobs=True):
+    ProjData().insert([
+        {'id': 0, 'resp': 20.33, 'sim': 45.324, 'big': 3, 'blah': 'yes'},
+        {'id': 1, 'resp': 94.3, 'sim': 34.23,
+            'big': {'key1': np.random.randn(20, 10)}, 'blah': 'si'},
+        {'id': 2, 'resp': 1.90, 'sim': 10.23,
+            'big': np.random.randn(4, 2), 'blah': 'sim'}
+    ])
 
 
 class TestFetchSame:

tests/test_jobs.py

@@ -89,7 +89,7 @@ def test_sigterm():
 
 
 def test_suppress_dj_errors():
-    """ test_suppress_dj_errors: dj errors suppressable w/o native py blobs """
+    """ test_suppress_dj_errors: dj errors suppressible w/o native py blobs """
     schema.schema.jobs.delete()
     with dj.config(enable_python_native_blobs=False):
         schema.ErrorClass.populate(reserve_jobs=True, suppress_errors=True)