openstack/python-openstackclient
Code Issues Proposed changes

Merge "Prefer assertEqual/assertIn over assertOutput/assertInOutput"

Browse Source
This commit is contained in:
Jenkins 2016-04-14 19:55:26 +00:00 committed by Gerrit Code Review
commit e1305185d3
5 changed files with 11 additions and 11 deletions

2
functional/tests/common/test_quota.py

@ -35,4 +35,4 @@ class QuotaTests(test.TestCase):
def test_quota_show(self):
raw_output = self.openstack('quota show ' + self.PROJECT_NAME)
for expected_field in self.EXPECTED_FIELDS:
self.assertInOutput(expected_field, raw_output)
self.assertIn(expected_field, raw_output)

2
functional/tests/identity/v2/test_endpoint.py

@ -27,7 +27,7 @@ class EndpointTests(test_identity.IdentityTests):
def test_endpoint_list(self):
endpoint_id = self._create_dummy_endpoint()
raw_output = self.openstack('endpoint list')
self.assertInOutput(endpoint_id, raw_output)
self.assertIn(endpoint_id, raw_output)
items = self.parse_listing(raw_output)
self.assert_table_structure(items, self.ENDPOINT_LIST_HEADERS)

2
functional/tests/identity/v3/test_endpoint.py

@ -31,7 +31,7 @@ class EndpointTests(test_identity.IdentityTests):
def test_endpoint_list(self):
endpoint_id = self._create_dummy_endpoint()
raw_output = self.openstack('endpoint list')
self.assertInOutput(endpoint_id, raw_output)
self.assertIn(endpoint_id, raw_output)
items = self.parse_listing(raw_output)
self.assert_table_structure(items, self.ENDPOINT_LIST_HEADERS)

14
functional/tests/identity/v3/test_group.py

@ -25,7 +25,7 @@ class GroupTests(test_identity.IdentityTests):
raw_output = self.openstack('group list')
items = self.parse_listing(raw_output)
self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
self.assertInOutput(group_name, raw_output)
self.assertIn(group_name, raw_output)
def test_group_list_with_domain(self):
group_name = self._create_dummy_group()
@ -33,7 +33,7 @@ class GroupTests(test_identity.IdentityTests):
'group list --domain %s' % self.domain_name)
items = self.parse_listing(raw_output)
self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
self.assertInOutput(group_name, raw_output)
self.assertIn(group_name, raw_output)
def test_group_delete(self):
group_name = self._create_dummy_group(add_clean_up=False)
@ -102,7 +102,7 @@ class GroupTests(test_identity.IdentityTests):
'user_domain': self.domain_name,
'group': group_name,
'user': username})
self.assertOutput(
self.assertEqual(
'%(user)s added to group %(group)s\n' % {'user': username,
'group': group_name},
raw_output
@ -128,7 +128,7 @@ class GroupTests(test_identity.IdentityTests):
'user_domain': self.domain_name,
'group': group_name,
'user': username})
self.assertOutput(
self.assertEqual(
'%(user)s added to group %(group)s\n' % {'user': username,
'group': group_name},
raw_output
@ -141,7 +141,7 @@ class GroupTests(test_identity.IdentityTests):
'user_domain': self.domain_name,
'group': group_name,
'user': username})
self.assertOutput(
self.assertEqual(
'%(user)s in group %(group)s\n' % {'user': username,
'group': group_name},
raw_output)
@ -165,12 +165,12 @@ class GroupTests(test_identity.IdentityTests):
'user_domain': self.domain_name,
'group': group_name,
'user': username})
self.assertOutput(
self.assertEqual(
'%(user)s added to group %(group)s\n' % {'user': username,
'group': group_name},
add_raw_output
)
self.assertOutput(
self.assertEqual(
'%(user)s removed from '
'group %(group)s\n' % {'user': username,
'group': group_name},

2
functional/tests/identity/v3/test_project.py

@ -65,7 +65,7 @@ class ProjectTests(test_identity.IdentityTests):
'project list --domain %s' % self.domain_name)
items = self.parse_listing(raw_output)
self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
self.assertInOutput(project_name, raw_output)
self.assertIn(project_name, raw_output)
self.assertTrue(len(items) > 0)
def test_project_set(self):