Fix tests that rely on the ordering of values in a dictionary.
Reviewed in https://codereview.appspot.com/7311096/.
diff --git a/tests/test_discovery.py b/tests/test_discovery.py
index 1c8b706..46d8e33 100644
--- a/tests/test_discovery.py
+++ b/tests/test_discovery.py
@@ -863,7 +863,7 @@
self.assertTrue(hasattr(new_zoo, 'scopedAnimals'))
self.assertTrue(callable(new_zoo.scopedAnimals))
- self.assertEqual(zoo._dynamic_attrs, new_zoo._dynamic_attrs)
+ self.assertEqual(sorted(zoo._dynamic_attrs), sorted(new_zoo._dynamic_attrs))
self.assertEqual(zoo._baseUrl, new_zoo._baseUrl)
self.assertEqual(zoo._developerKey, new_zoo._developerKey)
self.assertEqual(zoo._requestBuilder, new_zoo._requestBuilder)
diff --git a/tests/test_push.py b/tests/test_push.py
index 5a42835..7c5ce0d 100644
--- a/tests/test_push.py
+++ b/tests/test_push.py
@@ -19,6 +19,7 @@
from apiclient import push
from apiclient import model
from apiclient import http
+from test_discovery import assertUrisEqual
class ClientTokenGeneratorTest(unittest.TestCase):
@@ -92,13 +93,15 @@
def test_creation_no_appengine(self):
c = push.WebhookChannel('http://example.org')
- self.assertEqual('web_hook?url=http%3A%2F%2Fexample.org&app_engine=false',
- c.as_header_value())
+ assertUrisEqual(self,
+ 'web_hook?url=http%3A%2F%2Fexample.org&app_engine=false',
+ c.as_header_value())
def test_creation_appengine(self):
c = push.WebhookChannel('http://example.org', app_engine=True)
- self.assertEqual('web_hook?url=http%3A%2F%2Fexample.org&app_engine=true',
- c.as_header_value())
+ assertUrisEqual(self,
+ 'web_hook?url=http%3A%2F%2Fexample.org&app_engine=true',
+ c.as_header_value())
class HeadersTest(unittest.TestCase):
@@ -146,15 +149,17 @@
c = push.WebhookChannel('http://example.org')
s = push.Subscription.for_channel(c)
self.assertTrue(s.client_token)
- self.assertEqual('web_hook?url=http%3A%2F%2Fexample.org&app_engine=false',
- s.subscribe)
+ assertUrisEqual(self,
+ 'web_hook?url=http%3A%2F%2Fexample.org&app_engine=false',
+ s.subscribe)
def test_create_for_channel_client_token(self):
c = push.WebhookChannel('http://example.org')
s = push.Subscription.for_channel(c, client_token='my_token')
self.assertEqual('my_token', s.client_token)
- self.assertEqual('web_hook?url=http%3A%2F%2Fexample.org&app_engine=false',
- s.subscribe)
+ assertUrisEqual(self,
+ 'web_hook?url=http%3A%2F%2Fexample.org&app_engine=false',
+ s.subscribe)
def test_subscribe(self):
s = push.Subscription()