Merge pull request apache#999 from datastax/replace-lz4-test

mambocab · web-flow · commit 1920cf028640 · 2018-11-26T11:56:42.000-05:00
PYTHON-1042: replacement for lz4 test
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+3.17.0
+======
+NOT RELEASED
+
+Other
+-----
+* Fail faster on incorrect lz4 import (PYTHON-1042)
+
+
 3.16.0
 ======
 November 12, 2018
diff --git a/cassandra/connection.py b/cassandra/connection.py
@@ -68,6 +68,17 @@
     except ImportError:
         lz4_block = lz4
 
+    try:
+        lz4_block.compress
+        lz4_block.decompress
+    except AttributeError:
+        raise ImportError(
+            'lz4 not imported correctly. Imported object should have '
+            '.compress and and .decompress attributes but does not. '
+            'Please file a bug report on JIRA. (Imported object was '
+            '{lz4_block})'.format(lz4_block=repr(lz4_block))
+        )
+
     # Cassandra writes the uncompressed message length in big endian order,
     # but the lz4 lib requires little endian order, so we wrap these
     # functions to handle that
diff --git a/tests/unit/test_connection.py b/tests/unit/test_connection.py
@@ -411,14 +411,6 @@ def send_msg(msg, req_id, msg_callback):
             [call(connection)] * get_holders.call_count)
 
 
-class LZ4Tests(unittest.TestCase):
-    def test_lz4_is_correctly_imported(self):
-        try:
-            import lz4
-        except ImportError:
-            return
-        from lz4 import block as lz4_block
-
 class TimerTest(unittest.TestCase):
 
     def test_timer_collision(self):
