openstack/python-openstackclient
Code Issues Proposed changes

add domain id to expected IdP fields, unskip tests

Browse Source 
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
This commit is contained in:
Steve Martinelli 2017-01-06 14:01:05 -08:00
parent a6bfea9c6f
commit 29146ab684
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstackclient/tests/functional/identity/v3/common.py
View File

@ -42,7 +42,8 @@ class IdentityTests(base.TestCase):
ENDPOINT_LIST_HEADERS = ['ID', 'Region', 'Service Name', 'Service Type', ENDPOINT_LIST_HEADERS = ['ID', 'Region', 'Service Name', 'Service Type',
'Enabled', 'Interface', 'URL'] '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'] IDENTITY_PROVIDER_LIST_HEADERS = ['ID', 'Enabled', 'Description']
SERVICE_PROVIDER_FIELDS = ['auth_url', 'description', 'enabled', SERVICE_PROVIDER_FIELDS = ['auth_url', 'description', 'enabled',

7
openstackclient/tests/functional/identity/v3/test_idp.py
View File

@ -11,7 +11,6 @@
# under the License. # under the License.
from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
import testtools
from openstackclient.tests.functional.identity.v3 import common from openstackclient.tests.functional.identity.v3 import common
@ -19,18 +18,15 @@ from openstackclient.tests.functional.identity.v3 import common
class IdentityProviderTests(common.IdentityTests): class IdentityProviderTests(common.IdentityTests):
# Introduce functional test case for command 'Identity Provider' # Introduce functional test case for command 'Identity Provider'
@testtools.skip('domain resource changed')
def test_idp_create(self): def test_idp_create(self):
self._create_dummy_idp() self._create_dummy_idp()
@testtools.skip('domain resource changed')
def test_idp_delete(self): def test_idp_delete(self):
identity_provider = self._create_dummy_idp(add_clean_up=False) identity_provider = self._create_dummy_idp(add_clean_up=False)
raw_output = self.openstack('identity provider delete %s' raw_output = self.openstack('identity provider delete %s'
% identity_provider) % identity_provider)
self.assertEqual(0, len(raw_output)) self.assertEqual(0, len(raw_output))
@testtools.skip('domain resource changed')
def test_idp_multi_delete(self): def test_idp_multi_delete(self):
idp_1 = self._create_dummy_idp(add_clean_up=False) idp_1 = self._create_dummy_idp(add_clean_up=False)
idp_2 = 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)) 'identity provider delete %s %s' % (idp_1, idp_2))
self.assertEqual(0, len(raw_output)) self.assertEqual(0, len(raw_output))
@testtools.skip('domain resource changed')
def test_idp_show(self): def test_idp_show(self):
identity_provider = self._create_dummy_idp(add_clean_up=True) identity_provider = self._create_dummy_idp(add_clean_up=True)
raw_output = self.openstack('identity provider show %s' raw_output = self.openstack('identity provider show %s'
@ -46,14 +41,12 @@ class IdentityProviderTests(common.IdentityTests):
items = self.parse_show(raw_output) items = self.parse_show(raw_output)
self.assert_show_fields(items, self.IDENTITY_PROVIDER_FIELDS) self.assert_show_fields(items, self.IDENTITY_PROVIDER_FIELDS)
@testtools.skip('domain resource changed')
def test_idp_list(self): def test_idp_list(self):
self._create_dummy_idp(add_clean_up=True) self._create_dummy_idp(add_clean_up=True)
raw_output = self.openstack('identity provider list') raw_output = self.openstack('identity provider list')
items = self.parse_listing(raw_output) items = self.parse_listing(raw_output)
self.assert_table_structure(items, self.IDENTITY_PROVIDER_LIST_HEADERS) self.assert_table_structure(items, self.IDENTITY_PROVIDER_LIST_HEADERS)
@testtools.skip('domain resource changed')
def test_idp_set(self): def test_idp_set(self):
identity_provider = self._create_dummy_idp(add_clean_up=True) identity_provider = self._create_dummy_idp(add_clean_up=True)
new_remoteid = data_utils.rand_name('newRemoteId') new_remoteid = data_utils.rand_name('newRemoteId')