Merge branch 'master' into travis_upgrade

This commit is contained in:
Jon Haddad
2014-08-13 08:03:54 -07:00

View File

@@ -62,7 +62,8 @@ class TestModelIO(BaseCassEngTestCase):
'a_bool': tm.a_bool, 'a_bool': tm.a_bool,
} }
self.assertEquals(sorted(tm.keys()), sorted(column_dict.keys())) self.assertEquals(sorted(tm.keys()), sorted(column_dict.keys()))
self.assertEquals(sorted(tm.values()), sorted(column_dict.values()))
self.assertItemsEqual(tm.values(), column_dict.values())
self.assertEquals( self.assertEquals(
sorted(tm.items(), key=itemgetter(0)), sorted(tm.items(), key=itemgetter(0)),
sorted(column_dict.items(), key=itemgetter(0))) sorted(column_dict.items(), key=itemgetter(0)))