diff options
| author | Steve Martinelli <s.martinelli@gmail.com> | 2017-01-06 14:01:05 -0800 |
|---|---|---|
| committer | Steve Martinelli <s.martinelli@gmail.com> | 2017-01-07 00:24:52 -0500 |
| commit | 29146ab684a4cb4fccb647a6b8aa7b0561f15f8b (patch) | |
| tree | 66f508681e3d585ec50ec182937a1054641f5230 /openstackclient | |
| parent | a6bfea9c6fa16a241b006c9d2c3e714ab8e5c7c3 (diff) | |
| download | python-openstackclient-29146ab684a4cb4fccb647a6b8aa7b0561f15f8b.tar.gz | |
add domain id to expected IdP fields, unskip tests
commit Id18b8b2fe853b97631bc990df8188ed64a6e1275 added domain IDs
to an Identity provider, our functional tests have a hard match
on what to expect when 'showing' an idp, the domain ID was missing.
Change-Id: I87a1fd762918551c533668a9aa94f7c6268b79d6
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/functional/identity/v3/common.py | 3 | ||||
| -rw-r--r-- | openstackclient/tests/functional/identity/v3/test_idp.py | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/openstackclient/tests/functional/identity/v3/common.py b/openstackclient/tests/functional/identity/v3/common.py index 5dd42e70..3b6fc27b 100644 --- a/openstackclient/tests/functional/identity/v3/common.py +++ b/openstackclient/tests/functional/identity/v3/common.py @@ -42,7 +42,8 @@ class IdentityTests(base.TestCase): ENDPOINT_LIST_HEADERS = ['ID', 'Region', 'Service Name', 'Service Type', 'Enabled', 'Interface', 'URL'] - IDENTITY_PROVIDER_FIELDS = ['description', 'enabled', 'id', 'remote_ids'] + IDENTITY_PROVIDER_FIELDS = ['description', 'enabled', 'id', 'remote_ids', + 'domain_id'] IDENTITY_PROVIDER_LIST_HEADERS = ['ID', 'Enabled', 'Description'] SERVICE_PROVIDER_FIELDS = ['auth_url', 'description', 'enabled', diff --git a/openstackclient/tests/functional/identity/v3/test_idp.py b/openstackclient/tests/functional/identity/v3/test_idp.py index a81cafa9..5db3610a 100644 --- a/openstackclient/tests/functional/identity/v3/test_idp.py +++ b/openstackclient/tests/functional/identity/v3/test_idp.py @@ -11,7 +11,6 @@ # under the License. from tempest.lib.common.utils import data_utils -import testtools from openstackclient.tests.functional.identity.v3 import common @@ -19,18 +18,15 @@ from openstackclient.tests.functional.identity.v3 import common class IdentityProviderTests(common.IdentityTests): # Introduce functional test case for command 'Identity Provider' - @testtools.skip('domain resource changed') def test_idp_create(self): self._create_dummy_idp() - @testtools.skip('domain resource changed') def test_idp_delete(self): identity_provider = self._create_dummy_idp(add_clean_up=False) raw_output = self.openstack('identity provider delete %s' % identity_provider) self.assertEqual(0, len(raw_output)) - @testtools.skip('domain resource changed') def test_idp_multi_delete(self): idp_1 = self._create_dummy_idp(add_clean_up=False) idp_2 = self._create_dummy_idp(add_clean_up=False) @@ -38,7 +34,6 @@ class IdentityProviderTests(common.IdentityTests): 'identity provider delete %s %s' % (idp_1, idp_2)) self.assertEqual(0, len(raw_output)) - @testtools.skip('domain resource changed') def test_idp_show(self): identity_provider = self._create_dummy_idp(add_clean_up=True) raw_output = self.openstack('identity provider show %s' @@ -46,14 +41,12 @@ class IdentityProviderTests(common.IdentityTests): items = self.parse_show(raw_output) self.assert_show_fields(items, self.IDENTITY_PROVIDER_FIELDS) - @testtools.skip('domain resource changed') def test_idp_list(self): self._create_dummy_idp(add_clean_up=True) raw_output = self.openstack('identity provider list') items = self.parse_listing(raw_output) self.assert_table_structure(items, self.IDENTITY_PROVIDER_LIST_HEADERS) - @testtools.skip('domain resource changed') def test_idp_set(self): identity_provider = self._create_dummy_idp(add_clean_up=True) new_remoteid = data_utils.rand_name('newRemoteId') |