Skip to content

Commit 29146ab

Browse files
committed
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
1 parent a6bfea9 commit 29146ab

2 files changed

Lines changed: 2 additions & 8 deletions

File tree

openstackclient/tests/functional/identity/v3/common.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class IdentityTests(base.TestCase):
4242
ENDPOINT_LIST_HEADERS = ['ID', 'Region', 'Service Name', 'Service Type',
4343
'Enabled', 'Interface', 'URL']
4444

45-
IDENTITY_PROVIDER_FIELDS = ['description', 'enabled', 'id', 'remote_ids']
45+
IDENTITY_PROVIDER_FIELDS = ['description', 'enabled', 'id', 'remote_ids',
46+
'domain_id']
4647
IDENTITY_PROVIDER_LIST_HEADERS = ['ID', 'Enabled', 'Description']
4748

4849
SERVICE_PROVIDER_FIELDS = ['auth_url', 'description', 'enabled',

openstackclient/tests/functional/identity/v3/test_idp.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,49 +11,42 @@
1111
# under the License.
1212

1313
from tempest.lib.common.utils import data_utils
14-
import testtools
1514

1615
from openstackclient.tests.functional.identity.v3 import common
1716

1817

1918
class IdentityProviderTests(common.IdentityTests):
2019
# Introduce functional test case for command 'Identity Provider'
2120

22-
@testtools.skip('domain resource changed')
2321
def test_idp_create(self):
2422
self._create_dummy_idp()
2523

26-
@testtools.skip('domain resource changed')
2724
def test_idp_delete(self):
2825
identity_provider = self._create_dummy_idp(add_clean_up=False)
2926
raw_output = self.openstack('identity provider delete %s'
3027
% identity_provider)
3128
self.assertEqual(0, len(raw_output))
3229

33-
@testtools.skip('domain resource changed')
3430
def test_idp_multi_delete(self):
3531
idp_1 = self._create_dummy_idp(add_clean_up=False)
3632
idp_2 = self._create_dummy_idp(add_clean_up=False)
3733
raw_output = self.openstack(
3834
'identity provider delete %s %s' % (idp_1, idp_2))
3935
self.assertEqual(0, len(raw_output))
4036

41-
@testtools.skip('domain resource changed')
4237
def test_idp_show(self):
4338
identity_provider = self._create_dummy_idp(add_clean_up=True)
4439
raw_output = self.openstack('identity provider show %s'
4540
% identity_provider)
4641
items = self.parse_show(raw_output)
4742
self.assert_show_fields(items, self.IDENTITY_PROVIDER_FIELDS)
4843

49-
@testtools.skip('domain resource changed')
5044
def test_idp_list(self):
5145
self._create_dummy_idp(add_clean_up=True)
5246
raw_output = self.openstack('identity provider list')
5347
items = self.parse_listing(raw_output)
5448
self.assert_table_structure(items, self.IDENTITY_PROVIDER_LIST_HEADERS)
5549

56-
@testtools.skip('domain resource changed')
5750
def test_idp_set(self):
5851
identity_provider = self._create_dummy_idp(add_clean_up=True)
5952
new_remoteid = data_utils.rand_name('newRemoteId')

0 commit comments

Comments
 (0)