Skip to content

Commit 2c03f6f

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "fix the wrong order of assertEqual args"
2 parents 520b2f1 + 127af15 commit 2c03f6f

27 files changed

Lines changed: 283 additions & 283 deletions

‎openstackclient/tests/common/test_commandmanager.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,22 @@ def test_add_command_group(self):
5555
mock_cmd_one = mock.Mock()
5656
mgr.add_command('mock', mock_cmd_one)
5757
cmd_mock, name, args = mgr.find_command(['mock'])
58-
self.assertEqual(cmd_mock, mock_cmd_one)
58+
self.assertEqual(mock_cmd_one, cmd_mock)
5959

6060
# Find a command added in initialization
6161
cmd_one, name, args = mgr.find_command(['one'])
62-
self.assertEqual(cmd_one, FAKE_CMD_ONE)
62+
self.assertEqual(FAKE_CMD_ONE, cmd_one)
6363

6464
# Load another command group
6565
mgr.add_command_group('greek')
6666

6767
# Find a new command
6868
cmd_alpha, name, args = mgr.find_command(['alpha'])
69-
self.assertEqual(cmd_alpha, FAKE_CMD_ALPHA)
69+
self.assertEqual(FAKE_CMD_ALPHA, cmd_alpha)
7070

7171
# Ensure that the original commands were not overwritten
7272
cmd_two, name, args = mgr.find_command(['two'])
73-
self.assertEqual(cmd_two, FAKE_CMD_TWO)
73+
self.assertEqual(FAKE_CMD_TWO, cmd_two)
7474

7575
def test_get_command_groups(self):
7676
mgr = FakeCommandManager('test')
@@ -79,7 +79,7 @@ def test_get_command_groups(self):
7979
mock_cmd_one = mock.Mock()
8080
mgr.add_command('mock', mock_cmd_one)
8181
cmd_mock, name, args = mgr.find_command(['mock'])
82-
self.assertEqual(cmd_mock, mock_cmd_one)
82+
self.assertEqual(mock_cmd_one, cmd_mock)
8383

8484
# Load another command group
8585
mgr.add_command_group('greek')

‎openstackclient/tests/common/test_extension.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def test_extension_list_no_options(self):
7575
self.identity_extensions_mock.list.assert_called_with()
7676

7777
collist = ('Name', 'Alias', 'Description')
78-
self.assertEqual(columns, collist)
78+
self.assertEqual(collist, columns)
7979
datalist = (
8080
(
8181
identity_fakes.extension_name,
@@ -88,7 +88,7 @@ def test_extension_list_no_options(self):
8888
network_fakes.extension_description,
8989
),
9090
)
91-
self.assertEqual(tuple(data), datalist)
91+
self.assertEqual(datalist, tuple(data))
9292

9393
def test_extension_list_long(self):
9494
arglist = [
@@ -107,7 +107,7 @@ def test_extension_list_long(self):
107107

108108
collist = ('Name', 'Namespace', 'Description', 'Alias', 'Updated',
109109
'Links')
110-
self.assertEqual(columns, collist)
110+
self.assertEqual(collist, columns)
111111
datalist = (
112112
(
113113
identity_fakes.extension_name,
@@ -126,7 +126,7 @@ def test_extension_list_long(self):
126126
network_fakes.extension_links,
127127
),
128128
)
129-
self.assertEqual(tuple(data), datalist)
129+
self.assertEqual(datalist, tuple(data))
130130

131131
def test_extension_list_identity(self):
132132
arglist = [
@@ -143,13 +143,13 @@ def test_extension_list_identity(self):
143143
self.identity_extensions_mock.list.assert_called_with()
144144

145145
collist = ('Name', 'Alias', 'Description')
146-
self.assertEqual(columns, collist)
146+
self.assertEqual(collist, columns)
147147
datalist = ((
148148
identity_fakes.extension_name,
149149
identity_fakes.extension_alias,
150150
identity_fakes.extension_description,
151151
), )
152-
self.assertEqual(tuple(data), datalist)
152+
self.assertEqual(datalist, tuple(data))
153153

154154
def test_extension_list_network(self):
155155
arglist = [
@@ -165,12 +165,12 @@ def test_extension_list_network(self):
165165
self.network_extensions_mock.assert_called_with()
166166

167167
collist = ('Name', 'Alias', 'Description')
168-
self.assertEqual(columns, collist)
168+
self.assertEqual(collist, columns)
169169
datalist = (
170170
(
171171
network_fakes.extension_name,
172172
network_fakes.extension_alias,
173173
network_fakes.extension_description,
174174
),
175175
)
176-
self.assertEqual(tuple(data), datalist)
176+
self.assertEqual(datalist, tuple(data))

‎openstackclient/tests/common/test_parseractions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ def test_error_values(self):
101101
# There should be no red or blue
102102
expect = {'green': '100%'}
103103
self.assertDictEqual(expect, actual)
104-
self.assertEqual(failhere, None)
104+
self.assertEqual(None, failhere)

‎openstackclient/tests/common/test_utils.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ def test_get_password_good(self):
3131
mock_stdin = mock.Mock()
3232
mock_stdin.isatty = mock.Mock()
3333
mock_stdin.isatty.return_value = True
34-
self.assertEqual(utils.get_password(mock_stdin), PASSWORD)
34+
self.assertEqual(PASSWORD, utils.get_password(mock_stdin))
3535

3636
def test_get_password_bad_once(self):
3737
answers = [PASSWORD, WASSPORD, DROWSSAP, DROWSSAP]
3838
with mock.patch("getpass.getpass", side_effect=answers):
3939
mock_stdin = mock.Mock()
4040
mock_stdin.isatty = mock.Mock()
4141
mock_stdin.isatty.return_value = True
42-
self.assertEqual(utils.get_password(mock_stdin), DROWSSAP)
42+
self.assertEqual(DROWSSAP, utils.get_password(mock_stdin))
4343

4444
def test_get_password_no_tty(self):
4545
mock_stdin = mock.Mock()

‎openstackclient/tests/identity/v2_0/test_endpoint.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def test_endpoint_create(self):
8484

8585
collist = ('adminurl', 'id', 'internalurl', 'publicurl',
8686
'region', 'service_id', 'service_name', 'service_type')
87-
self.assertEqual(columns, collist)
87+
self.assertEqual(collist, columns)
8888
datalist = (
8989
identity_fakes.endpoint_adminurl,
9090
identity_fakes.endpoint_id,
@@ -96,7 +96,7 @@ def test_endpoint_create(self):
9696
identity_fakes.service_type,
9797
)
9898

99-
self.assertEqual(data, datalist)
99+
self.assertEqual(datalist, data)
100100

101101

102102
class TestEndpointDelete(TestEndpoint):
@@ -171,14 +171,14 @@ def test_endpoint_list_no_options(self):
171171
self.endpoints_mock.list.assert_called_with()
172172

173173
collist = ('ID', 'Region', 'Service Name', 'Service Type')
174-
self.assertEqual(columns, collist)
174+
self.assertEqual(collist, columns)
175175
datalist = ((
176176
identity_fakes.endpoint_id,
177177
identity_fakes.endpoint_region,
178178
identity_fakes.service_name,
179179
identity_fakes.service_type,
180180
), )
181-
self.assertEqual(tuple(data), datalist)
181+
self.assertEqual(datalist, tuple(data))
182182

183183
def test_endpoint_list_long(self):
184184
arglist = [
@@ -196,7 +196,7 @@ def test_endpoint_list_long(self):
196196

197197
collist = ('ID', 'Region', 'Service Name', 'Service Type',
198198
'PublicURL', 'AdminURL', 'InternalURL')
199-
self.assertEqual(columns, collist)
199+
self.assertEqual(collist, columns)
200200
datalist = ((
201201
identity_fakes.endpoint_id,
202202
identity_fakes.endpoint_region,
@@ -206,7 +206,7 @@ def test_endpoint_list_long(self):
206206
identity_fakes.endpoint_adminurl,
207207
identity_fakes.endpoint_internalurl,
208208
), )
209-
self.assertEqual(tuple(data), datalist)
209+
self.assertEqual(datalist, tuple(data))
210210

211211

212212
class TestEndpointShow(TestEndpoint):
@@ -252,7 +252,7 @@ def test_endpoint_show(self):
252252

253253
collist = ('adminurl', 'id', 'internalurl', 'publicurl',
254254
'region', 'service_id', 'service_name', 'service_type')
255-
self.assertEqual(columns, collist)
255+
self.assertEqual(collist, columns)
256256
datalist = (
257257
identity_fakes.endpoint_adminurl,
258258
identity_fakes.endpoint_id,
@@ -263,4 +263,4 @@ def test_endpoint_show(self):
263263
identity_fakes.service_name,
264264
identity_fakes.service_type,
265265
)
266-
self.assertEqual(data, datalist)
266+
self.assertEqual(datalist, data)

‎openstackclient/tests/identity/v2_0/test_project.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ def test_project_create_no_options(self):
7171
)
7272

7373
collist = ('description', 'enabled', 'id', 'name')
74-
self.assertEqual(columns, collist)
74+
self.assertEqual(collist, columns)
7575
datalist = (
7676
identity_fakes.project_description,
7777
True,
7878
identity_fakes.project_id,
7979
identity_fakes.project_name,
8080
)
81-
self.assertEqual(data, datalist)
81+
self.assertEqual(datalist, data)
8282

8383
def test_project_create_description(self):
8484
arglist = [
@@ -105,14 +105,14 @@ def test_project_create_description(self):
105105
)
106106

107107
collist = ('description', 'enabled', 'id', 'name')
108-
self.assertEqual(columns, collist)
108+
self.assertEqual(collist, columns)
109109
datalist = (
110110
identity_fakes.project_description,
111111
True,
112112
identity_fakes.project_id,
113113
identity_fakes.project_name,
114114
)
115-
self.assertEqual(data, datalist)
115+
self.assertEqual(datalist, data)
116116

117117
def test_project_create_enable(self):
118118
arglist = [
@@ -140,14 +140,14 @@ def test_project_create_enable(self):
140140
)
141141

142142
collist = ('description', 'enabled', 'id', 'name')
143-
self.assertEqual(columns, collist)
143+
self.assertEqual(collist, columns)
144144
datalist = (
145145
identity_fakes.project_description,
146146
True,
147147
identity_fakes.project_id,
148148
identity_fakes.project_name,
149149
)
150-
self.assertEqual(data, datalist)
150+
self.assertEqual(datalist, data)
151151

152152
def test_project_create_disable(self):
153153
arglist = [
@@ -175,14 +175,14 @@ def test_project_create_disable(self):
175175
)
176176

177177
collist = ('description', 'enabled', 'id', 'name')
178-
self.assertEqual(columns, collist)
178+
self.assertEqual(collist, columns)
179179
datalist = (
180180
identity_fakes.project_description,
181181
True,
182182
identity_fakes.project_id,
183183
identity_fakes.project_name,
184184
)
185-
self.assertEqual(data, datalist)
185+
self.assertEqual(datalist, data)
186186

187187
def test_project_create_property(self):
188188
arglist = [
@@ -212,14 +212,14 @@ def test_project_create_property(self):
212212
)
213213

214214
collist = ('description', 'enabled', 'id', 'name')
215-
self.assertEqual(columns, collist)
215+
self.assertEqual(collist, columns)
216216
datalist = (
217217
identity_fakes.project_description,
218218
True,
219219
identity_fakes.project_id,
220220
identity_fakes.project_name,
221221
)
222-
self.assertEqual(data, datalist)
222+
self.assertEqual(datalist, data)
223223

224224
def test_project_create_or_show_exists(self):
225225
def _raise_conflict(*args, **kwargs):
@@ -331,7 +331,7 @@ def test_project_delete_no_options(self):
331331
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
332332

333333
result = self.cmd.run(parsed_args)
334-
self.assertEqual(result, 0)
334+
self.assertEqual(0, result)
335335

336336
self.projects_mock.delete.assert_called_with(
337337
identity_fakes.project_id,
@@ -364,12 +364,12 @@ def test_project_list_no_options(self):
364364
self.projects_mock.list.assert_called_with()
365365

366366
collist = ('ID', 'Name')
367-
self.assertEqual(columns, collist)
367+
self.assertEqual(collist, columns)
368368
datalist = ((
369369
identity_fakes.project_id,
370370
identity_fakes.project_name,
371371
), )
372-
self.assertEqual(tuple(data), datalist)
372+
self.assertEqual(datalist, tuple(data))
373373

374374
def test_project_list_long(self):
375375
arglist = [
@@ -385,14 +385,14 @@ def test_project_list_long(self):
385385
self.projects_mock.list.assert_called_with()
386386

387387
collist = ('ID', 'Name', 'Description', 'Enabled')
388-
self.assertEqual(columns, collist)
388+
self.assertEqual(collist, columns)
389389
datalist = ((
390390
identity_fakes.project_id,
391391
identity_fakes.project_name,
392392
identity_fakes.project_description,
393393
True,
394394
), )
395-
self.assertEqual(tuple(data), datalist)
395+
self.assertEqual(datalist, tuple(data))
396396

397397

398398
class TestProjectSet(TestProject):
@@ -426,7 +426,7 @@ def test_project_set_no_options(self):
426426
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
427427

428428
result = self.cmd.run(parsed_args)
429-
self.assertEqual(result, 0)
429+
self.assertEqual(0, result)
430430

431431
def test_project_set_name(self):
432432
arglist = [
@@ -442,7 +442,7 @@ def test_project_set_name(self):
442442
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
443443

444444
result = self.cmd.run(parsed_args)
445-
self.assertEqual(result, 0)
445+
self.assertEqual(0, result)
446446

447447
# Set expected values
448448
kwargs = {
@@ -469,7 +469,7 @@ def test_project_set_description(self):
469469
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
470470

471471
result = self.cmd.run(parsed_args)
472-
self.assertEqual(result, 0)
472+
self.assertEqual(0, result)
473473

474474
# Set expected values
475475
kwargs = {
@@ -495,7 +495,7 @@ def test_project_set_enable(self):
495495
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
496496

497497
result = self.cmd.run(parsed_args)
498-
self.assertEqual(result, 0)
498+
self.assertEqual(0, result)
499499

500500
# Set expected values
501501
kwargs = {
@@ -521,7 +521,7 @@ def test_project_set_disable(self):
521521
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
522522

523523
result = self.cmd.run(parsed_args)
524-
self.assertEqual(result, 0)
524+
self.assertEqual(0, result)
525525

526526
# Set expected values
527527
kwargs = {
@@ -547,7 +547,7 @@ def test_project_set_property(self):
547547
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
548548

549549
result = self.cmd.run(parsed_args)
550-
self.assertEqual(result, 0)
550+
self.assertEqual(0, result)
551551

552552
# Set expected values
553553
kwargs = {
@@ -593,11 +593,11 @@ def test_project_show(self):
593593
)
594594

595595
collist = ('description', 'enabled', 'id', 'name')
596-
self.assertEqual(columns, collist)
596+
self.assertEqual(collist, columns)
597597
datalist = (
598598
identity_fakes.project_description,
599599
True,
600600
identity_fakes.project_id,
601601
identity_fakes.project_name,
602602
)
603-
self.assertEqual(data, datalist)
603+
self.assertEqual(datalist, data)

0 commit comments

Comments
 (0)