Skip to content

Commit 870fa2f

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Correct addCleanup use in functests"
2 parents 418793e + e2e9c49 commit 870fa2f

6 files changed

Lines changed: 89 additions & 88 deletions

File tree

‎functional/tests/identity/v2/test_identity.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ def _create_dummy_project(self, add_clean_up=True):
6767
'--description %(description)s '
6868
'--enable %(name)s' % {'description': project_description,
6969
'name': project_name})
70-
items = self.parse_show(raw_output)
71-
self.assert_show_fields(items, self.PROJECT_FIELDS)
7270
project = self.parse_show_as_object(raw_output)
7371
if add_clean_up:
7472
self.addCleanup(
7573
self.openstack,
7674
'project delete %s' % project['id'])
75+
items = self.parse_show(raw_output)
76+
self.assert_show_fields(items, self.PROJECT_FIELDS)
7777
return project_name
7878

7979
def _create_dummy_user(self, add_clean_up=True):
@@ -90,47 +90,47 @@ def _create_dummy_user(self, add_clean_up=True):
9090
'email': email,
9191
'password': password,
9292
'name': username})
93-
items = self.parse_show(raw_output)
94-
self.assert_show_fields(items, self.USER_FIELDS)
9593
if add_clean_up:
9694
self.addCleanup(
9795
self.openstack,
9896
'user delete %s' % self.parse_show_as_object(raw_output)['id'])
97+
items = self.parse_show(raw_output)
98+
self.assert_show_fields(items, self.USER_FIELDS)
9999
return username
100100

101101
def _create_dummy_role(self, add_clean_up=True):
102102
role_name = data_utils.rand_name('TestRole')
103103
raw_output = self.openstack('role create %s' % role_name)
104-
items = self.parse_show(raw_output)
105-
self.assert_show_fields(items, self.ROLE_FIELDS)
106104
role = self.parse_show_as_object(raw_output)
107-
self.assertEqual(role_name, role['name'])
108105
if add_clean_up:
109106
self.addCleanup(
110107
self.openstack,
111108
'role delete %s' % role['id'])
109+
items = self.parse_show(raw_output)
110+
self.assert_show_fields(items, self.ROLE_FIELDS)
111+
self.assertEqual(role_name, role['name'])
112112
return role_name
113113

114114
def _create_dummy_ec2_credentials(self, add_clean_up=True):
115115
raw_output = self.openstack('ec2 credentials create')
116-
items = self.parse_show(raw_output)
117-
self.assert_show_fields(items, self.EC2_CREDENTIALS_FIELDS)
118116
ec2_credentials = self.parse_show_as_object(raw_output)
119117
access_key = ec2_credentials['access']
120118
if add_clean_up:
121119
self.addCleanup(
122120
self.openstack,
123121
'ec2 credentials delete %s' % access_key)
122+
items = self.parse_show(raw_output)
123+
self.assert_show_fields(items, self.EC2_CREDENTIALS_FIELDS)
124124
return access_key
125125

126126
def _create_dummy_token(self, add_clean_up=True):
127127
raw_output = self.openstack('token issue')
128-
items = self.parse_show(raw_output)
129-
self.assert_show_fields(items, self.TOKEN_FIELDS)
130128
token = self.parse_show_as_object(raw_output)
131129
if add_clean_up:
132130
self.addCleanup(self.openstack,
133131
'token revoke %s' % token['id'])
132+
items = self.parse_show(raw_output)
133+
self.assert_show_fields(items, self.TOKEN_FIELDS)
134134
return token['id']
135135

136136
def _create_dummy_service(self, add_clean_up=True):
@@ -144,12 +144,12 @@ def _create_dummy_service(self, add_clean_up=True):
144144
'%(type)s' % {'name': service_name,
145145
'description': description,
146146
'type': type_name})
147-
items = self.parse_show(raw_output)
148-
self.assert_show_fields(items, self.SERVICE_FIELDS)
149147
if add_clean_up:
150148
service = self.parse_show_as_object(raw_output)
151149
self.addCleanup(self.openstack,
152150
'service delete %s' % service['id'])
151+
items = self.parse_show(raw_output)
152+
self.assert_show_fields(items, self.SERVICE_FIELDS)
153153
return service_name
154154

155155
def _create_dummy_endpoint(self, add_clean_up=True):
@@ -169,11 +169,11 @@ def _create_dummy_endpoint(self, add_clean_up=True):
169169
'internalurl': internal_url,
170170
'region': region_id,
171171
'service': service_name})
172-
items = self.parse_show(raw_output)
173-
self.assert_show_fields(items, self.ENDPOINT_FIELDS)
174172
endpoint = self.parse_show_as_object(raw_output)
175173
if add_clean_up:
176174
self.addCleanup(
177175
self.openstack,
178176
'endpoint delete %s' % endpoint['id'])
177+
items = self.parse_show(raw_output)
178+
self.assert_show_fields(items, self.ENDPOINT_FIELDS)
179179
return endpoint['id']

‎functional/tests/identity/v2/test_role.py‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,17 @@ def test_role_list_with_user_project(self):
4040
'%(role)s' % {'project': project_name,
4141
'user': username,
4242
'role': role_name})
43+
self.addCleanup(
44+
self.openstack,
45+
'role remove '
46+
'--project %(project)s '
47+
'--user %(user)s '
48+
'%(role)s' % {'project': project_name,
49+
'user': username,
50+
'role': role_name})
4351
items = self.parse_show(raw_output)
4452
self.assert_show_fields(items, self.ROLE_FIELDS)
53+
4554
raw_output = self.openstack(
4655
'role list '
4756
'--project %(project)s '
@@ -51,14 +60,6 @@ def test_role_list_with_user_project(self):
5160
items = self.parse_listing(raw_output)
5261
self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
5362
self.assertEqual(1, len(items))
54-
self.addCleanup(
55-
self.openstack,
56-
'role remove '
57-
'--project %(project)s '
58-
'--user %(user)s '
59-
'%(role)s' % {'project': project_name,
60-
'user': username,
61-
'role': role_name})
6263

6364
def test_role_show(self):
6465
role_name = self._create_dummy_role()
@@ -76,8 +77,6 @@ def test_role_add(self):
7677
'%(role)s' % {'project': self.project_name,
7778
'user': username,
7879
'role': role_name})
79-
items = self.parse_show(raw_output)
80-
self.assert_show_fields(items, self.ROLE_FIELDS)
8180
self.addCleanup(
8281
self.openstack,
8382
'role remove '
@@ -86,24 +85,26 @@ def test_role_add(self):
8685
'%(role)s' % {'project': self.project_name,
8786
'user': username,
8887
'role': role_name})
88+
items = self.parse_show(raw_output)
89+
self.assert_show_fields(items, self.ROLE_FIELDS)
8990

9091
def test_role_remove(self):
9192
role_name = self._create_dummy_role()
9293
username = self._create_dummy_user()
93-
raw_output = self.openstack(
94+
add_raw_output = self.openstack(
9495
'role add '
9596
'--project %(project)s '
9697
'--user %(user)s '
9798
'%(role)s' % {'project': self.project_name,
9899
'user': username,
99100
'role': role_name})
100-
items = self.parse_show(raw_output)
101-
self.assert_show_fields(items, self.ROLE_FIELDS)
102-
raw_output = self.openstack(
101+
del_raw_output = self.openstack(
103102
'role remove '
104103
'--project %(project)s '
105104
'--user %(user)s '
106105
'%(role)s' % {'project': self.project_name,
107106
'user': username,
108107
'role': role_name})
109-
self.assertEqual(0, len(raw_output))
108+
items = self.parse_show(add_raw_output)
109+
self.assert_show_fields(items, self.ROLE_FIELDS)
110+
self.assertEqual(0, len(del_raw_output))

‎functional/tests/identity/v3/test_domain.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ class DomainTests(test_identity.IdentityTests):
2121
def test_domain_create(self):
2222
domain_name = data_utils.rand_name('TestDomain')
2323
raw_output = self.openstack('domain create %s' % domain_name)
24-
items = self.parse_show(raw_output)
25-
self.assert_show_fields(items, self.DOMAIN_FIELDS)
2624
# disable domain first before deleting it
2725
self.addCleanup(self.openstack,
2826
'domain delete %s' % domain_name)
2927
self.addCleanup(self.openstack,
3028
'domain set --disable %s' % domain_name)
29+
items = self.parse_show(raw_output)
30+
self.assert_show_fields(items, self.DOMAIN_FIELDS)
3131

3232
def test_domain_list(self):
3333
self._create_dummy_domain()

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ def test_group_add_user(self):
9393
'user_domain': self.domain_name,
9494
'group': group_name,
9595
'user': username})
96-
self.assertOutput(
97-
'%(user)s added to group %(group)s\n' % {'user': username,
98-
'group': group_name},
99-
raw_output
100-
)
10196
self.addCleanup(
10297
self.openstack,
10398
'group remove user '
@@ -107,6 +102,11 @@ def test_group_add_user(self):
107102
'user_domain': self.domain_name,
108103
'group': group_name,
109104
'user': username})
105+
self.assertOutput(
106+
'%(user)s added to group %(group)s\n' % {'user': username,
107+
'group': group_name},
108+
raw_output
109+
)
110110

111111
def test_group_contains_user(self):
112112
group_name = self._create_dummy_group()
@@ -119,6 +119,15 @@ def test_group_contains_user(self):
119119
'user_domain': self.domain_name,
120120
'group': group_name,
121121
'user': username})
122+
self.addCleanup(
123+
self.openstack,
124+
'group remove user '
125+
'--group-domain %(group_domain)s '
126+
'--user-domain %(user_domain)s '
127+
'%(group)s %(user)s' % {'group_domain': self.domain_name,
128+
'user_domain': self.domain_name,
129+
'group': group_name,
130+
'user': username})
122131
self.assertOutput(
123132
'%(user)s added to group %(group)s\n' % {'user': username,
124133
'group': group_name},
@@ -136,43 +145,34 @@ def test_group_contains_user(self):
136145
'%(user)s in group %(group)s\n' % {'user': username,
137146
'group': group_name},
138147
raw_output)
139-
self.addCleanup(
140-
self.openstack,
141-
'group remove user '
142-
'--group-domain %(group_domain)s '
143-
'--user-domain %(user_domain)s '
144-
'%(group)s %(user)s' % {'group_domain': self.domain_name,
145-
'user_domain': self.domain_name,
146-
'group': group_name,
147-
'user': username})
148148

149149
def test_group_remove_user(self):
150150
group_name = self._create_dummy_group()
151151
username = self._create_dummy_user()
152-
raw_output = self.openstack(
152+
add_raw_output = self.openstack(
153153
'group add user '
154154
'--group-domain %(group_domain)s '
155155
'--user-domain %(user_domain)s '
156156
'%(group)s %(user)s' % {'group_domain': self.domain_name,
157157
'user_domain': self.domain_name,
158158
'group': group_name,
159159
'user': username})
160-
self.assertOutput(
161-
'%(user)s added to group %(group)s\n' % {'user': username,
162-
'group': group_name},
163-
raw_output
164-
)
165-
raw_output = self.openstack(
160+
remove_raw_output = self.openstack(
166161
'group remove user '
167162
'--group-domain %(group_domain)s '
168163
'--user-domain %(user_domain)s '
169164
'%(group)s %(user)s' % {'group_domain': self.domain_name,
170165
'user_domain': self.domain_name,
171166
'group': group_name,
172167
'user': username})
168+
self.assertOutput(
169+
'%(user)s added to group %(group)s\n' % {'user': username,
170+
'group': group_name},
171+
add_raw_output
172+
)
173173
self.assertOutput(
174174
'%(user)s removed from '
175175
'group %(group)s\n' % {'user': username,
176176
'group': group_name},
177-
raw_output
177+
remove_raw_output
178178
)

0 commit comments

Comments
 (0)