Merge branch 'trunk' into make_rackspace_drivers_multi_datacenter_aware
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/e47636c5 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/e47636c5 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/e47636c5 Branch: refs/heads/make_rackspace_drivers_multi_datacenter_aware Commit: e47636c57f38dadeb905f841cf2c866b6198dced Parents: 6dde47c e522b71 Author: Tomaz Muraus <[email protected]> Authored: Sun Jun 23 20:35:39 2013 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Sun Jun 23 20:35:39 2013 +0200 ---------------------------------------------------------------------- CHANGES | 6 ++++++ libcloud/test/__init__.py | 7 ++++++- libcloud/test/loadbalancer/test_rackspace.py | 16 ++++++++-------- libcloud/utils/py3.py | 6 ++++++ setup.py | 12 ++++++++++++ tox.ini | 2 ++ 6 files changed, 40 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/e47636c5/CHANGES ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/e47636c5/libcloud/test/loadbalancer/test_rackspace.py ---------------------------------------------------------------------- diff --cc libcloud/test/loadbalancer/test_rackspace.py index 9a04b0e,ac94b19..778121b --- a/libcloud/test/loadbalancer/test_rackspace.py +++ b/libcloud/test/loadbalancer/test_rackspace.py @@@ -1326,10 -1329,10 +1326,10 @@@ class RackspaceLBMockHttp(MockHttpTestC raise NotImplementedError - def _v1_0_slug_loadbalancers_3130(self, method, url, body, headers): + def _v1_0_11111_loadbalancers_3130(self, method, url, body, headers): """ update_balancer(b, protocol='HTTPS'), then get_balancer('3130') """ if method == "PUT": - self.assertEqual(json.loads(body), {'protocol': 'HTTPS'}) + self.assertDictEqual(json.loads(body), {'protocol': 'HTTPS'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) @@@ -1338,10 -1341,10 +1338,10 @@@ return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) raise NotImplementedError - def _v1_0_slug_loadbalancers_3131(self, method, url, body, headers): + def _v1_0_11111_loadbalancers_3131(self, method, url, body, headers): """ update_balancer(b, port=443), then get_balancer('3131') """ if method == "PUT": - self.assertEqual(json.loads(body), {'port': 1337}) + self.assertDictEqual(json.loads(body), {'port': 1337}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) @@@ -1350,10 -1353,10 +1350,10 @@@ return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) raise NotImplementedError - def _v1_0_slug_loadbalancers_3132(self, method, url, body, headers): + def _v1_0_11111_loadbalancers_3132(self, method, url, body, headers): """ update_balancer(b, name='new_lb_name'), then get_balancer('3132') """ if method == "PUT": - self.assertEqual(json.loads(body), {'name': 'new_lb_name'}) + self.assertDictEqual(json.loads(body), {'name': 'new_lb_name'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) @@@ -1362,10 -1365,10 +1362,10 @@@ return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) raise NotImplementedError - def _v1_0_slug_loadbalancers_3133(self, method, url, body, headers): + def _v1_0_11111_loadbalancers_3133(self, method, url, body, headers): """ update_balancer(b, algorithm='ROUND_ROBIN'), then get_balancer('3133') """ if method == "PUT": - self.assertEqual(json.loads(body), {'algorithm': 'ROUND_ROBIN'}) + self.assertDictEqual(json.loads(body), {'algorithm': 'ROUND_ROBIN'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) @@@ -1380,10 -1383,10 +1380,10 @@@ return (httplib.BAD_REQUEST, "", {}, httplib.responses[httplib.BAD_REQUEST]) raise NotImplementedError - def _v1_0_slug_loadbalancers_3135(self, method, url, body, headers): + def _v1_0_11111_loadbalancers_3135(self, method, url, body, headers): """ update_balancer(b, protocol='IMAPv3'), then get_balancer('3135') """ if method == "PUT": - self.assertEqual(json.loads(body), {'protocol': 'IMAPv2'}) + self.assertDictEqual(json.loads(body), {'protocol': 'IMAPv2'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) @@@ -1392,10 -1395,10 +1392,10 @@@ return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) raise NotImplementedError - def _v1_0_slug_loadbalancers_3136(self, method, url, body, headers): + def _v1_0_11111_loadbalancers_3136(self, method, url, body, headers): """ update_balancer(b, protocol='IMAPv3'), then get_balancer('3136') """ if method == "PUT": - self.assertEqual(json.loads(body), {'protocol': 'IMAPv3'}) + self.assertDictEqual(json.loads(body), {'protocol': 'IMAPv3'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) @@@ -1404,10 -1407,10 +1404,10 @@@ return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) raise NotImplementedError - def _v1_0_slug_loadbalancers_3137(self, method, url, body, headers): + def _v1_0_11111_loadbalancers_3137(self, method, url, body, headers): """ update_balancer(b, protocol='IMAPv3'), then get_balancer('3137') """ if method == "PUT": - self.assertEqual(json.loads(body), {'protocol': 'IMAPv4'}) + self.assertDictEqual(json.loads(body), {'protocol': 'IMAPv4'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json"))
