Fix tests that fail on Python < 2.7.8.

See tobgu/pyrsistent#27
ClusterHQ · Mar 2, 2015 · a7dd251 · a7dd251
1 parent 4fad8f0
commit a7dd251
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/flocker/control/test/test_model.py b/flocker/control/test/test_model.py
@@ -6,7 +6,7 @@
 
 from uuid import uuid4
 
-from pyrsistent import InvariantException
+from pyrsistent import InvariantException, pset
 
 from twisted.trial.unittest import SynchronousTestCase
 from twisted.python.filepath import FilePath
@@ -125,7 +125,7 @@ def test_repr(self):
 
 class NodeInitTests(make_with_init_tests(
         record_type=Node,
-        kwargs=dict(hostname=u'example.com', applications=frozenset([
+        kwargs=dict(hostname=u'example.com', applications=pset([
             Application(name=u'mysql-clusterhq', image=object()),
             Application(name=u'site-clusterhq.com', image=object()),
         ]))

diff --git a/flocker/node/test/test_deploy.py b/flocker/node/test/test_deploy.py
@@ -9,7 +9,7 @@
 from zope.interface.verify import verifyObject
 from zope.interface import implementer
 
-from pyrsistent import pmap
+from pyrsistent import pmap, pset
 
 from twisted.internet.defer import fail, FirstError, succeed, Deferred
 from twisted.trial.unittest import SynchronousTestCase, TestCase
@@ -1192,13 +1192,14 @@ def test_discover_datasets(self):
         d = api.discover_local_state()
 
         self.assertEqual(
-            {Manifestation(
-                dataset=Dataset(
-                    dataset_id=DATASET_ID,
-                    metadata=pmap({u"name": u"site-example.com"})),
-                primary=True),
-             Manifestation(dataset=Dataset(dataset_id=DATASET_ID2),
-                           primary=True)},
+            pset(
+                {Manifestation(
+                    dataset=Dataset(
+                        dataset_id=DATASET_ID,
+                        metadata=pmap({u"name": u"site-example.com"})),
+                    primary=True),
+                 Manifestation(dataset=Dataset(dataset_id=DATASET_ID2),
+                               primary=True)}),
             self.successResultOf(d).manifestations)