tests passing again

Author: alimanfoo

zarr/tests/test_storage.py

@@ -19,15 +19,16 @@
 from zarr.meta import decode_array_metadata, encode_array_metadata, \
     ZARR_FORMAT, decode_group_metadata, encode_group_metadata
 from zarr.compat import text_type
-from zarr.compressors import default_compression
+from zarr.storage import default_compression
+from zarr.codecs import ZlibCompressor
 
 
 class StoreTests(object):
     """Abstract store tests."""
 
-    # def create_store(self, **kwargs):
-    #     # implement in sub-class
-    #     pass
+    def create_store(self, **kwargs):
+        # implement in sub-class
+        raise NotImplementedError
 
     def test_get_set_del_contains(self):
         store = self.create_store()
@@ -230,8 +231,7 @@ def test_init_array(self):
         eq((1000,), meta['shape'])
         eq((100,), meta['chunks'])
         eq(np.dtype(None), meta['dtype'])
-        eq(default_compression, meta['compression'])
-        assert 'compression_opts' in meta
+        eq(default_compression, meta['compression']['id'])
         assert_is_none(meta['fill_value'])
 
         # check attributes
@@ -245,8 +245,7 @@ def test_init_array_overwrite(self):
             dict(shape=(2000,),
                  chunks=(200,),
                  dtype=np.dtype('u1'),
-                 compression='zlib',
-                 compression_opts=1,
+                 compression=ZlibCompressor(1).get_config(),
                  fill_value=0,
                  order='F',
                  filters=None)
@@ -283,8 +282,7 @@ def test_init_array_path(self):
         eq((1000,), meta['shape'])
         eq((100,), meta['chunks'])
         eq(np.dtype(None), meta['dtype'])
-        eq(default_compression, meta['compression'])
-        assert 'compression_opts' in meta
+        eq(default_compression, meta['compression']['id'])
         assert_is_none(meta['fill_value'])
 
         # check attributes
@@ -299,8 +297,7 @@ def test_init_array_overwrite_path(self):
         meta = dict(shape=(2000,),
                     chunks=(200,),
                     dtype=np.dtype('u1'),
-                    compression='zlib',
-                    compression_opts=1,
+                    compression=ZlibCompressor(1).get_config(),
                     fill_value=0,
                     order='F',
                     filters=None)
@@ -401,7 +398,6 @@ def test_init_array_compat(self):
                    compression_opts='foo')
         meta = decode_array_metadata(store[array_meta_key])
         assert_is_none(meta['compression'])
-        assert_is_none(meta['compression_opts'])
 
     def test_init_group(self):
         store = self.create_store()

zarr/tests/test_sync.py

@@ -56,11 +56,10 @@ def test_repr(self):
             z = self.create_array(shape=100, chunks=10, dtype='f4',
                                   compression='zlib', compression_opts=1)
             # flake8: noqa
-            expect = """zarr.core.Array((100,), float32, chunks=(10,), order=C)
-  compression: zlib; compression_opts: 1
-  nbytes: 400; nbytes_stored: 231; ratio: 1.7; initialized: 0/10
-  store: builtins.dict
-  synchronizer: zarr.sync.ThreadSynchronizer
+            expect = """Array((100,), float32, chunks=(10,), order=C)
+  nbytes: 400; nbytes_stored: 246; ratio: 1.6; initialized: 0/10
+  compressor: ZlibCompressor(level=1)
+  store: dict; synchronizer: ThreadSynchronizer
 """
             actual = repr(z)
             for l1, l2 in zip(expect.split('\n'), actual.split('\n')):
@@ -86,11 +85,10 @@ def test_repr(self):
             z = self.create_array(shape=100, chunks=10, dtype='f4',
                                   compression='zlib', compression_opts=1)
             # flake8: noqa
-            expect = """zarr.core.Array((100,), float32, chunks=(10,), order=C)
-  compression: zlib; compression_opts: 1
-  nbytes: 400; nbytes_stored: 231; ratio: 1.7; initialized: 0/10
-  store: builtins.dict
-  synchronizer: zarr.sync.ProcessSynchronizer
+            expect = """Array((100,), float32, chunks=(10,), order=C)
+  nbytes: 400; nbytes_stored: 246; ratio: 1.6; initialized: 0/10
+  compressor: ZlibCompressor(level=1)
+  store: dict; synchronizer: ProcessSynchronizer
 """
             actual = repr(z)
             for l1, l2 in zip(expect.split('\n'), actual.split('\n')):