[cassandra-dbapi2] push by pcannon@gmail.com - update test_cql:test_create_column_family test on 2012-08-19 23:58 GMT

[ca...@codespot.com]

Revision: c084cb76ad87
Author:   paul cannon <pa...@datastax.com>
Date:     Sun Aug 19 16:58:25 2012
Log:      update test_cql:test_create_column_family test

http://code.google.com/a/apache-extras.org/p/cassandra-dbapi2/source/detail?r=c084cb76ad87

Modified:
  /test/test_cql.py

=======================================
--- /test/test_cql.py	Mon Jul  9 21:42:25 2012
+++ /test/test_cql.py	Sun Aug 19 16:58:25 2012
@@ -40,6 +40,7 @@

  import cql
  from cql.cassandra import Cassandra
+from cql.cqltypes import AsciiType, UUIDType

  def get_thrift_client(host=TEST_HOST, port=TEST_PORT):
      socket = TSocket.TSocket(host, port)
@@ -685,8 +686,10 @@
              SELECT KEY, '%s' FROM StandardTimeUUID WHERE KEY = 'uuidtest'
          """ % str(timeuuid))
          self.assertEqual(len(cursor.name_info), 2)
-        self.assertEqual(cursor.name_info[0], ('KEY', 'AsciiType'))
-        self.assertEqual(cursor.name_info[1], (timeuuid.bytes, 'UUIDType'))
+        self.assertEqual(cursor.name_info[0][0], 'KEY')
+        self.assertIsSubclass(cursor.name_info[0][1], AsciiType)
+        self.assertEqual(cursor.name_info[1][0], timeuuid.bytes)
+        self.assertIsSubclass(cursor.name_info[1][1], UUIDType)

      def test_time_uuid(self):
          "store and retrieve time-based (type 1) uuids"