diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-31 00:28:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-31 00:28:20 +0000 |
| commit | 0a8c96073c3dd76df346c262898303f6fb7435d6 (patch) | |
| tree | dfab485739a325d0e062bffd4da578c3de3b9cd6 | |
| parent | de8622cd8e34d658db7fe5e069ee386878549a87 (diff) | |
| parent | 916d4be6c2b873e9085b12f2c1bbc21ae8f9587c (diff) | |
| download | python-keystoneclient-0.1.3.tar.gz | |
Merge "fixing pep8 formatting for 1.0.1+ pep8"0.1.3
| -rw-r--r-- | tests/test_service_catalog.py | 91 | ||||
| -rw-r--r-- | tests/v2_0/test_discovery.py | 28 |
2 files changed, 55 insertions, 64 deletions
diff --git a/tests/test_service_catalog.py b/tests/test_service_catalog.py index 8d89d27..9397405 100644 --- a/tests/test_service_catalog.py +++ b/tests/test_service_catalog.py @@ -19,61 +19,56 @@ SERVICE_CATALOG = { "user": { "id": "123", "name": "jqsmith", - "roles": [{ - "id": "234", - "name": "compute:admin" - }, - { - "id": "235", - "name": "object-store:admin", - "tenantId": "1" - }], + "roles": [ + {"id": "234", + "name": "compute:admin"}, + {"id": "235", + "name": "object-store:admin", + "tenantId": "1"} + ], "roles_links": [] }, "serviceCatalog": [{ "name": "Cloud Servers", "type": "compute", - "endpoints": [{ - "tenantId": "1", - "publicURL": "https://compute.north.host/v1/1234", - "internalURL": "https://compute.north.host/v1/1234", - "region": "North", - "versionId": "1.0", - "versionInfo": "https://compute.north.host/v1.0/", - "versionList": "https://compute.north.host/" - }, - { - "tenantId": "2", - "publicURL": "https://compute.north.host/v1.1/3456", - "internalURL": "https://compute.north.host/v1.1/3456", - "region": "North", - "versionId": "1.1", - "versionInfo": "https://compute.north.host/v1.1/", - "versionList": "https://compute.north.host/" - }], + "endpoints": [ + {"tenantId": "1", + "publicURL": "https://compute.north.host/v1/1234", + "internalURL": "https://compute.north.host/v1/1234", + "region": "North", + "versionId": "1.0", + "versionInfo": "https://compute.north.host/v1.0/", + "versionList": "https://compute.north.host/"}, + {"tenantId": "2", + "publicURL": "https://compute.north.host/v1.1/3456", + "internalURL": "https://compute.north.host/v1.1/3456", + "region": "North", + "versionId": "1.1", + "versionInfo": "https://compute.north.host/v1.1/", + "versionList": "https://compute.north.host/"} + ], "endpoints_links": [] }, { "name": "Cloud Files", "type": "object-store", - "endpoints": [{ - "tenantId": "11", - "publicURL": "https://compute.north.host/v1/blah-blah", - "internalURL": "https://compute.north.host/v1/blah-blah", - "region": "South", - "versionId": "1.0", - "versionInfo": "uri", - "versionList": "uri" - }, - { - "tenantId": "2", - "publicURL": "https://compute.north.host/v1.1/blah-blah", - "internalURL": "https://compute.north.host/v1.1/blah-blah", - "region": "South", - "versionId": "1.1", - "versionInfo": "https://compute.north.host/v1.1/", - "versionList": "https://compute.north.host/" - }], + "endpoints": [ + {"tenantId": "11", + "publicURL": "https://compute.north.host/v1/blah-blah", + "internalURL": "https://compute.north.host/v1/blah-blah", + "region": "South", + "versionId": "1.0", + "versionInfo": "uri", + "versionList": "uri"}, + {"tenantId": "2", + "publicURL": "https://compute.north.host/v1.1/blah-blah", + "internalURL": + "https://compute.north.host/v1.1/blah-blah", + "region": "South", + "versionId": "1.1", + "versionInfo": "https://compute.north.host/v1.1/", + "versionList": "https://compute.north.host/"} + ], "endpoints_links":[{ "rel":"next", "href":"https://identity.north.host/v2.0/" @@ -95,11 +90,11 @@ class ServiceCatalogTest(utils.TestCase): sc = service_catalog.ServiceCatalog(SERVICE_CATALOG['access']) self.assertEquals(sc.url_for(service_type='compute'), - "https://compute.north.host/v1/1234") + "https://compute.north.host/v1/1234") self.assertEquals(sc.url_for('tenantId', '1', service_type='compute'), - "https://compute.north.host/v1/1234") + "https://compute.north.host/v1/1234") self.assertEquals(sc.url_for('tenantId', '2', service_type='compute'), - "https://compute.north.host/v1.1/3456") + "https://compute.north.host/v1.1/3456") self.assertRaises(exceptions.EndpointNotFound, sc.url_for, "region", "South", service_type='compute') diff --git a/tests/v2_0/test_discovery.py b/tests/v2_0/test_discovery.py index 1e417c7..e3804c2 100644 --- a/tests/v2_0/test_discovery.py +++ b/tests/v2_0/test_discovery.py @@ -28,28 +28,24 @@ class DiscoverKeystoneTests(utils.UnauthenticatedTestCase): "updated": "2011-11-19T00:00:00Z", "links": [ {"rel": "self", - "href": "http://127.0.0.1:5000/v2.0/", - }, + "href": "http://127.0.0.1:5000/v2.0/", }, {"rel": "describedby", "type": "text/html", "href": "http://docs.openstack.org/api/" - "openstack-identity-service/2.0/content/", - }, { - "rel": "describedby", - "type": "application/pdf", - "href": "http://docs.openstack.org/api/" - "openstack-identity-service/2.0/" - "identity-dev-guide-2.0.pdf", - }, { - "rel": "describedby", - "type": "application/vnd.sun.wadl+xml", - "href": "http://127.0.0.1:5000/v2.0/identity.wadl", - }], + "openstack-identity-service/2.0/content/", }, + {"rel": "describedby", + "type": "application/pdf", + "href": "http://docs.openstack.org/api/" + "openstack-identity-service/2.0/" + "identity-dev-guide-2.0.pdf", }, + {"rel": "describedby", + "type": "application/vnd.sun.wadl+xml", + "href": "http://127.0.0.1:5000/v2.0/identity.wadl", } + ], "media-types": [{ "base": "application/xml", "type": "application/vnd.openstack.identity-v2.0+xml", - }, - { + }, { "base": "application/json", "type": "application/vnd.openstack.identity-v2.0+json", }], |