Add warning to cqlengine docs about LWT and batch statements

beltran · beltran · commit 5bad3548ab5e · 2018-02-23T13:51:59.000-05:00
diff --git a/cassandra/cqlengine/query.py b/cassandra/cqlengine/query.py
@@ -19,7 +19,7 @@
 import six
 from warnings import warn
 
-from cassandra.query import SimpleStatement, BatchType as CBatchType
+from cassandra.query import SimpleStatement, BatchType as CBatchType, BatchStatement
 from cassandra.cqlengine import columns, CQLEngineException, ValidationError, UnicodeMixin
 from cassandra.cqlengine import connection as conn
 from cassandra.cqlengine.functions import Token, BaseQueryFunction, QueryValue
@@ -67,7 +67,9 @@ class MultipleObjectsReturned(QueryException):
 
 def check_applied(result):
     """
-    Raises LWTException if it looks like a failed LWT request.
+    Raises LWTException if it looks like a failed LWT request. A LWTException
+    won't be raised in the special case in which there are several failed LWT
+    in a  :class:`~cqlengine.query.BatchQuery`.
     """
     try:
         applied = result.was_applied
diff --git a/tests/integration/cqlengine/test_lwt_conditional.py b/tests/integration/cqlengine/test_lwt_conditional.py
@@ -142,6 +142,7 @@ def test_batch_update_conditional(self):
         updated = TestConditionalModel.objects(id=id).first()
         self.assertEqual(updated.text, 'something else')
 
+    @unittest.skip("Skipping until PYTHON-943 is resolved")
     def test_batch_update_conditional_several_rows(self):
         sync_table(TestUpdateModel)
         self.addCleanup(drop_table, TestUpdateModel)
