PYTHON-336 test tweaks and changelog

aholmberg · aholmberg · commit 5e102605cdff · 2016-02-23T13:33:09.000-06:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,7 @@ Features
 * Pass name of server auth class to AuthProvider (PYTHON-454)
 * Surface schema agreed flag for DDL statements (PYTHON-458)
 * Automatically convert float and int to Decimal on serialization (PYTHON-468)
+* Expose prior state information via cqlengine LWTException (github #343)
 
 Bug Fixes
 ---------
diff --git a/docs/api/cassandra/cqlengine/models.rst b/docs/api/cassandra/cqlengine/models.rst
@@ -96,7 +96,7 @@ Model
                 TestIfNotExistsModel.if_not_exists().create(id=id, count=9, text='111111111111')
             except LWTException as e:
                 # handle failure case
-                print e.existing # existing object
+                print e.existing  # dict containing LWT result fields
 
         This method is supported on Cassandra 2.0 or later.
 
diff --git a/tests/integration/cqlengine/test_ifnotexists.py b/tests/integration/cqlengine/test_ifnotexists.py
@@ -85,7 +85,7 @@ def test_insert_if_not_exists_success(self):
         with self.assertRaises(LWTException) as assertion:
             TestIfNotExistsModel.if_not_exists().create(id=id, count=9, text='111111111111')
 
-        self.assertEquals(assertion.exception.existing, {
+        self.assertEqual(assertion.exception.existing, {
             'count': 8,
             'id': id,
             'text': '123456789',
@@ -128,7 +128,7 @@ def test_batch_insert_if_not_exists_success(self):
         with self.assertRaises(LWTException) as assertion:
             b.execute()
 
-        self.assertEquals(assertion.exception.existing, {
+        self.assertEqual(assertion.exception.existing, {
             'count': 8,
             'id': id,
             'text': '123456789',
