Skip to content

Commit 2c01f52

Browse files
stephenfinstephenfin
committed
tests: Trivial capitalization fixes
Change-Id: Ie6d518b44bfc27ae957816ce00a59a1cdf7b247b Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent aeb0c68 commit 2c01f52

9 files changed

Lines changed: 108 additions & 108 deletions

File tree

‎openstackclient/tests/functional/identity/v2/common.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,22 @@ class IdentityTests(base.TestCase):
5858
CATALOG_LIST_HEADERS = ['Name', 'Type', 'Endpoints']
5959
ENDPOINT_LIST_HEADERS = ['ID', 'Region', 'Service Name', 'Service Type']
6060

61-
project_name: ClassVar[str]
62-
project_description: ClassVar[str]
61+
PROJECT_NAME: ClassVar[str]
62+
PROJECT_DESCRIPTION: ClassVar[str]
6363

6464
@classmethod
6565
def setUpClass(cls):
6666
super().setUpClass()
6767
# create dummy project
68-
cls.project_name = data_utils.rand_name('TestProject')
69-
cls.project_description = data_utils.rand_name('description')
68+
cls.PROJECT_NAME = data_utils.rand_name('TestProject')
69+
cls.PROJECT_DESCRIPTION = data_utils.rand_name('description')
7070
try:
7171
cls.openstack(
7272
'--os-identity-api-version 2 '
7373
'project create '
74-
f'--description {cls.project_description} '
74+
f'--description {cls.PROJECT_DESCRIPTION} '
7575
'--enable '
76-
f'{cls.project_name}'
76+
f'{cls.PROJECT_NAME}'
7777
)
7878
except tempest_exceptions.CommandFailed:
7979
# Good chance this is due to Identity v2 admin not being enabled
@@ -87,7 +87,7 @@ def tearDownClass(cls):
8787
try:
8888
cls.openstack(
8989
'--os-identity-api-version 2 '
90-
f'project delete {cls.project_name}'
90+
f'project delete {cls.PROJECT_NAME}'
9191
)
9292
finally:
9393
super().tearDownClass()
@@ -129,7 +129,7 @@ def _create_dummy_user(self, add_clean_up=True):
129129
email = data_utils.rand_name() + '@example.com'
130130
raw_output = self.openstack(
131131
'user create '
132-
f'--project {self.project_name} '
132+
f'--project {self.PROJECT_NAME} '
133133
f'--password {password} '
134134
f'--email {email} '
135135
'--enable '

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ def test_role_add(self):
3939
username = self._create_dummy_user()
4040
raw_output = self.openstack(
4141
'role add '
42-
f'--project {self.project_name} '
42+
f'--project {self.PROJECT_NAME} '
4343
f'--user {username} '
4444
f'{role_name}'
4545
)
4646
self.addCleanup(
4747
self.openstack,
4848
'role remove '
49-
f'--project {self.project_name} '
49+
f'--project {self.PROJECT_NAME} '
5050
f'--user {username} '
5151
f'{role_name}',
5252
)
@@ -58,13 +58,13 @@ def test_role_remove(self):
5858
username = self._create_dummy_user()
5959
add_raw_output = self.openstack(
6060
'role add '
61-
f'--project {self.project_name} '
61+
f'--project {self.PROJECT_NAME} '
6262
f'--user {username} '
6363
f'{role_name}'
6464
)
6565
del_raw_output = self.openstack(
6666
'role remove '
67-
f'--project {self.project_name} '
67+
f'--project {self.PROJECT_NAME} '
6868
f'--user {username} '
6969
f'{role_name}'
7070
)

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -148,35 +148,35 @@ class IdentityTests(base.TestCase):
148148
'Region ID',
149149
]
150150

151-
domain_name: ClassVar[str]
152-
domain_description: ClassVar[str]
153-
project_name: ClassVar[str]
154-
project_description: ClassVar[str]
151+
DOMAIN_NAME: ClassVar[str]
152+
DOMAIN_DESCRIPTION: ClassVar[str]
153+
PROJECT_NAME: ClassVar[str]
154+
PROJECT_DESCRIPTION: ClassVar[str]
155155

156156
@classmethod
157157
def setUpClass(cls):
158158
super().setUpClass()
159159
# create dummy domain
160-
cls.domain_name = data_utils.rand_name('TestDomain')
161-
cls.domain_description = data_utils.rand_name('description')
160+
cls.DOMAIN_NAME = data_utils.rand_name('TestDomain')
161+
cls.DOMAIN_DESCRIPTION = data_utils.rand_name('description')
162162
cls.openstack(
163163
'--os-identity-api-version 3 '
164164
'domain create '
165-
f'--description {cls.domain_description} '
165+
f'--description {cls.DOMAIN_DESCRIPTION} '
166166
'--enable '
167-
f'{cls.domain_name}'
167+
f'{cls.DOMAIN_NAME}'
168168
)
169169

170170
# create dummy project
171-
cls.project_name = data_utils.rand_name('TestProject')
172-
cls.project_description = data_utils.rand_name('description')
171+
cls.PROJECT_NAME = data_utils.rand_name('TestProject')
172+
cls.PROJECT_DESCRIPTION = data_utils.rand_name('description')
173173
cls.openstack(
174174
'--os-identity-api-version 3 '
175175
'project create '
176-
f'--domain {cls.domain_name} '
177-
f'--description {cls.project_description} '
176+
f'--domain {cls.DOMAIN_NAME} '
177+
f'--description {cls.PROJECT_DESCRIPTION} '
178178
'--enable '
179-
f'{cls.project_name}'
179+
f'{cls.PROJECT_NAME}'
180180
)
181181

182182
@classmethod
@@ -185,15 +185,15 @@ def tearDownClass(cls):
185185
# delete dummy project
186186
cls.openstack(
187187
'--os-identity-api-version 3 '
188-
f'project delete {cls.project_name}'
188+
f'project delete {cls.PROJECT_NAME}'
189189
)
190190
# disable and delete dummy domain
191191
cls.openstack(
192192
'--os-identity-api-version 3 '
193-
f'domain set --disable {cls.domain_name}'
193+
f'domain set --disable {cls.DOMAIN_NAME}'
194194
)
195195
cls.openstack(
196-
f'--os-identity-api-version 3 domain delete {cls.domain_name}'
196+
f'--os-identity-api-version 3 domain delete {cls.DOMAIN_NAME}'
197197
)
198198
finally:
199199
super().tearDownClass()
@@ -219,9 +219,9 @@ def _create_dummy_user(self, add_clean_up=True):
219219
description = data_utils.rand_name('description')
220220
raw_output = self.openstack(
221221
'user create '
222-
f'--domain {self.domain_name} '
223-
f'--project {self.project_name} '
224-
f'--project-domain {self.domain_name} '
222+
f'--domain {self.DOMAIN_NAME} '
223+
f'--project {self.PROJECT_NAME} '
224+
f'--project-domain {self.DOMAIN_NAME} '
225225
f'--password {password} '
226226
f'--email {email} '
227227
f'--description {description} '
@@ -268,14 +268,14 @@ def _create_dummy_group(self, add_clean_up=True):
268268
description = data_utils.rand_name('description')
269269
raw_output = self.openstack(
270270
'group create '
271-
f'--domain {self.domain_name} '
271+
f'--domain {self.DOMAIN_NAME} '
272272
f'--description {description} '
273273
f'{group_name}'
274274
)
275275
if add_clean_up:
276276
self.addCleanup(
277277
self.openstack,
278-
f'group delete --domain {self.domain_name} {group_name}',
278+
f'group delete --domain {self.DOMAIN_NAME} {group_name}',
279279
)
280280
items = self.parse_show(raw_output)
281281
self.assert_show_fields(items, self.GROUP_FIELDS)
@@ -301,14 +301,14 @@ def _create_dummy_project(self, add_clean_up=True):
301301
project_description = data_utils.rand_name('description')
302302
self.openstack(
303303
'project create '
304-
f'--domain {self.domain_name} '
304+
f'--domain {self.DOMAIN_NAME} '
305305
f'--description {project_description} '
306306
f'--enable {project_name}'
307307
)
308308
if add_clean_up:
309309
self.addCleanup(
310310
self.openstack,
311-
f'project delete --domain {self.domain_name} {project_name}',
311+
f'project delete --domain {self.DOMAIN_NAME} {project_name}',
312312
)
313313
return project_name
314314

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@ def test_group_list(self):
2828

2929
def test_group_list_with_domain(self):
3030
group_name = self._create_dummy_group()
31-
raw_output = self.openstack(f'group list --domain {self.domain_name}')
31+
raw_output = self.openstack(f'group list --domain {self.DOMAIN_NAME}')
3232
items = self.parse_listing(raw_output)
3333
self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
3434
self.assertIn(group_name, raw_output)
3535

3636
def test_group_delete(self):
3737
group_name = self._create_dummy_group(add_clean_up=False)
3838
raw_output = self.openstack(
39-
f'group delete --domain {self.domain_name} {group_name}'
39+
f'group delete --domain {self.DOMAIN_NAME} {group_name}'
4040
)
4141
self.assertEqual(0, len(raw_output))
4242

4343
def test_group_show(self):
4444
group_name = self._create_dummy_group()
4545
raw_output = self.openstack(
46-
f'group show --domain {self.domain_name} {group_name}'
46+
f'group show --domain {self.DOMAIN_NAME} {group_name}'
4747
)
4848
items = self.parse_show(raw_output)
4949
self.assert_show_fields(items, self.GROUP_FIELDS)
@@ -53,20 +53,20 @@ def test_group_set(self):
5353
new_group_name = data_utils.rand_name('NewTestGroup')
5454
raw_output = self.openstack(
5555
'group set '
56-
f'--domain {self.domain_name} '
56+
f'--domain {self.DOMAIN_NAME} '
5757
f'--name {new_group_name} '
5858
f'{group_name}'
5959
)
6060
self.assertEqual(0, len(raw_output))
6161
raw_output = self.openstack(
62-
f'group show --domain {self.domain_name} {new_group_name}'
62+
f'group show --domain {self.DOMAIN_NAME} {new_group_name}'
6363
)
6464
group = self.parse_show_as_object(raw_output)
6565
self.assertEqual(new_group_name, group['name'])
6666
# reset group name to make sure it will be cleaned up
6767
raw_output = self.openstack(
6868
'group set '
69-
f'--domain {self.domain_name} '
69+
f'--domain {self.DOMAIN_NAME} '
7070
f'--name {group_name} '
7171
f'{new_group_name}'
7272
)
@@ -77,15 +77,15 @@ def test_group_add_user(self):
7777
username = self._create_dummy_user()
7878
raw_output = self.openstack(
7979
'group add user '
80-
f'--group-domain {self.domain_name} '
81-
f'--user-domain {self.domain_name} '
80+
f'--group-domain {self.DOMAIN_NAME} '
81+
f'--user-domain {self.DOMAIN_NAME} '
8282
f'{group_name} {username}'
8383
)
8484
self.addCleanup(
8585
self.openstack,
8686
'group remove user '
87-
f'--group-domain {self.domain_name} '
88-
f'--user-domain {self.domain_name} '
87+
f'--group-domain {self.DOMAIN_NAME} '
88+
f'--user-domain {self.DOMAIN_NAME} '
8989
f'{group_name} {username}',
9090
)
9191
self.assertOutput('', raw_output)
@@ -95,22 +95,22 @@ def test_group_contains_user(self):
9595
username = self._create_dummy_user()
9696
raw_output = self.openstack(
9797
'group add user '
98-
f'--group-domain {self.domain_name} '
99-
f'--user-domain {self.domain_name} '
98+
f'--group-domain {self.DOMAIN_NAME} '
99+
f'--user-domain {self.DOMAIN_NAME} '
100100
f'{group_name} {username}'
101101
)
102102
self.addCleanup(
103103
self.openstack,
104104
'group remove user '
105-
f'--group-domain {self.domain_name} '
106-
f'--user-domain {self.domain_name} '
105+
f'--group-domain {self.DOMAIN_NAME} '
106+
f'--user-domain {self.DOMAIN_NAME} '
107107
f'{group_name} {username}',
108108
)
109109
self.assertOutput('', raw_output)
110110
raw_output = self.openstack(
111111
'group contains user '
112-
f'--group-domain {self.domain_name} '
113-
f'--user-domain {self.domain_name} '
112+
f'--group-domain {self.DOMAIN_NAME} '
113+
f'--user-domain {self.DOMAIN_NAME} '
114114
f'{group_name} {username}'
115115
)
116116
self.assertEqual(
@@ -123,14 +123,14 @@ def test_group_remove_user(self):
123123
username = self._create_dummy_user()
124124
add_raw_output = self.openstack(
125125
'group add user '
126-
f'--group-domain {self.domain_name} '
127-
f'--user-domain {self.domain_name} '
126+
f'--group-domain {self.DOMAIN_NAME} '
127+
f'--user-domain {self.DOMAIN_NAME} '
128128
f'{group_name} {username}'
129129
)
130130
remove_raw_output = self.openstack(
131131
'group remove user '
132-
f'--group-domain {self.domain_name} '
133-
f'--user-domain {self.domain_name} '
132+
f'--group-domain {self.DOMAIN_NAME} '
133+
f'--user-domain {self.DOMAIN_NAME} '
134134
f'{group_name} {username}'
135135
)
136136
self.assertOutput('', add_raw_output)

‎openstackclient/tests/functional/identity/v3/test_project.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_project_create(self):
2121
description = data_utils.rand_name('description')
2222
raw_output = self.openstack(
2323
'project create '
24-
f'--domain {self.domain_name} '
24+
f'--domain {self.DOMAIN_NAME} '
2525
f'--description {description} '
2626
'--enable '
2727
'--property k1=v1 '
@@ -30,7 +30,7 @@ def test_project_create(self):
3030
)
3131
self.addCleanup(
3232
self.openstack,
33-
f'project delete --domain {self.domain_name} {project_name}',
33+
f'project delete --domain {self.DOMAIN_NAME} {project_name}',
3434
)
3535
items = self.parse_show(raw_output)
3636
show_fields = list(self.PROJECT_FIELDS)
@@ -43,7 +43,7 @@ def test_project_create(self):
4343
def test_project_delete(self):
4444
project_name = self._create_dummy_project(add_clean_up=False)
4545
raw_output = self.openstack(
46-
f'project delete --domain {self.domain_name} {project_name}'
46+
f'project delete --domain {self.DOMAIN_NAME} {project_name}'
4747
)
4848
self.assertEqual(0, len(raw_output))
4949

@@ -55,7 +55,7 @@ def test_project_list(self):
5555
def test_project_list_with_domain(self):
5656
project_name = self._create_dummy_project()
5757
raw_output = self.openstack(
58-
f'project list --domain {self.domain_name}'
58+
f'project list --domain {self.DOMAIN_NAME}'
5959
)
6060
items = self.parse_listing(raw_output)
6161
self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
@@ -75,7 +75,7 @@ def test_project_set(self):
7575
self.assertEqual(0, len(raw_output))
7676
# check project details
7777
raw_output = self.openstack(
78-
f'project show --domain {self.domain_name} {new_project_name}'
78+
f'project show --domain {self.DOMAIN_NAME} {new_project_name}'
7979
)
8080
items = self.parse_show(raw_output)
8181
fields = list(self.PROJECT_FIELDS)
@@ -92,7 +92,7 @@ def test_project_set(self):
9292

9393
def test_project_show(self):
9494
raw_output = self.openstack(
95-
f'project show --domain {self.domain_name} {self.project_name}'
95+
f'project show --domain {self.DOMAIN_NAME} {self.PROJECT_NAME}'
9696
)
9797
items = self.parse_show(raw_output)
9898
self.assert_show_fields(items, self.PROJECT_FIELDS)
@@ -101,10 +101,10 @@ def test_project_show_with_parents_children(self):
101101
output = self.openstack(
102102
'project show '
103103
'--parents --children '
104-
f'--domain {self.domain_name} '
105-
f'{self.project_name}',
104+
f'--domain {self.DOMAIN_NAME} '
105+
f'{self.PROJECT_NAME}',
106106
parse_output=True,
107107
)
108108
for attr_name in [*self.PROJECT_FIELDS, 'parents', 'subtree']:
109109
self.assertIn(attr_name, output)
110-
self.assertEqual(self.project_name, output.get('name'))
110+
self.assertEqual(self.PROJECT_NAME, output.get('name'))

0 commit comments

Comments
 (0)