diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-25 18:56:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-25 18:56:14 +0000 |
| commit | 0d8dab6288a81b7606c518eac3e0ea21f6d8dac3 (patch) | |
| tree | c57689b05809a18b767ab7f5968ce4dbc0afba1b /openstackclient/tests/identity/v3 | |
| parent | 646f702958b0a1b4a5e77305febe54119c1a3b5d (diff) | |
| parent | e44bb009d36bddc0fdfb6e949ddc293de291dcca (diff) | |
| download | python-openstackclient-0d8dab6288a81b7606c518eac3e0ea21f6d8dac3.tar.gz | |
Merge "keystone: fix catalog output when region is unset"
Diffstat (limited to 'openstackclient/tests/identity/v3')
| -rw-r--r-- | openstackclient/tests/identity/v3/test_catalog.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/openstackclient/tests/identity/v3/test_catalog.py b/openstackclient/tests/identity/v3/test_catalog.py index a03c9d3e..1b8fa085 100644 --- a/openstackclient/tests/identity/v3/test_catalog.py +++ b/openstackclient/tests/identity/v3/test_catalog.py @@ -38,6 +38,11 @@ class TestCatalog(utils.TestCommand): 'url': 'https://internal.example.com', 'interface': 'internal', }, + { + 'region': None, + 'url': 'https://none.example.com', + 'interface': 'none', + }, ], } @@ -81,7 +86,8 @@ class TestCatalogList(TestCatalog): 'compute', 'onlyone\n public: https://public.example.com\n' 'onlyone\n admin: https://admin.example.com\n' - '<none>\n internal: https://internal.example.com\n', + '<none>\n internal: https://internal.example.com\n' + '<none>\n none: https://none.example.com\n', ), ) self.assertEqual(datalist, tuple(data)) @@ -114,7 +120,8 @@ class TestCatalogShow(TestCatalog): datalist = ( 'onlyone\n public: https://public.example.com\nonlyone\n' ' admin: https://admin.example.com\n' - '<none>\n internal: https://internal.example.com\n', + '<none>\n internal: https://internal.example.com\n' + '<none>\n none: https://none.example.com\n', 'qwertyuiop', 'supernova', 'compute', |