openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Update existing integration test for new map type.

Browse Source
This commit is contained in:
Adam Holmberg
2015-01-15 11:19:08 -06:00
parent e824331d9b
commit 0a51e23aa8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cassandra/util.py
View File

@@ -622,6 +622,9 @@ class OrderedMap(Mapping):
self.__class__.__name__,
', '.join("(%r, %r)" % (k, v) for k, v in self._items))
def __str__(self):
return '{%s}' % ', '.join("%r: %r" % (k, v) for k, v in self._items)
@staticmethod
def _serialize_key(key):
return cPickle.dumps(key)

6
tests/integration/standard/test_types.py
View File

@@ -30,7 +30,7 @@ from cassandra import InvalidRequest
from cassandra.cluster import Cluster
from cassandra.cqltypes import Int32Type, EMPTY
from cassandra.query import dict_factory
from cassandra.util import OrderedDict, sortedset
from cassandra.util import OrderedMap, sortedset
from tests.integration import get_server_versions, use_singledc, PROTOCOL_VERSION
@@ -279,11 +279,11 @@ class TypeTests(unittest.TestCase):
s.execute("INSERT INTO mytable (a, b, c, o, s, l, n) VALUES ('a', 'b', %s, %s, %s, %s, %s)",
('', '', '', [''], {'': 3}))
self.assertEqual(
{'c': '', 'o': '', 's': '', 'l': [''], 'n': OrderedDict({'': 3})},
{'c': '', 'o': '', 's': '', 'l': [''], 'n': OrderedMap({'': 3})},
s.execute("SELECT c, o, s, l, n FROM mytable WHERE a='a' AND b='b'")[0])
self.assertEqual(
{'c': '', 'o': '', 's': '', 'l': [''], 'n': OrderedDict({'': 3})},
{'c': '', 'o': '', 's': '', 'l': [''], 'n': OrderedMap({'': 3})},
s.execute(s.prepare("SELECT c, o, s, l, n FROM mytable WHERE a='a' AND b='b'"), [])[0])
# non-string types shouldn't accept empty strings