Fixing typo in model type, fixing missed regex 2.7 compatibility issue

GregBestland · GregBestland · commit 464bb18e322d · 2016-03-07T10:16:07.000-06:00
diff --git a/tests/integration/cqlengine/model/test_class_construction.py b/tests/integration/cqlengine/model/test_class_construction.py
@@ -70,7 +70,7 @@ def test_attempting_to_make_duplicate_column_names_fails(self):
         Tests that trying to create conflicting db column names will fail
         """
 
-        with self.assertRaisesRegex(ModelException, r".*more than once$"):
+        with self.assertRaisesRegexp(ModelException, r".*more than once$"):
             class BadNames(Model):
                 words = columns.Text(primary_key=True)
                 content = columns.Text(db_field='words')
diff --git a/tests/integration/cqlengine/test_ifexists.py b/tests/integration/cqlengine/test_ifexists.py
@@ -30,7 +30,7 @@
 
 class TestIfExistsModel(Model):
 
-    id = columns.Integer(primary_key=True, default=lambda: uuid4())
+    id = columns.UUID(primary_key=True, default=lambda: uuid4())
     count = columns.Integer()
     text = columns.Text(required=False)
 
