Skip to content

Commit c8ddfd8

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Swap remaining assertEqual arguments"
2 parents 3001d60 + 46f6df5 commit c8ddfd8

1 file changed

Lines changed: 22 additions & 22 deletions

File tree

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ def test_user_create_no_options(self):
8484
)
8585

8686
collist = ('email', 'enabled', 'id', 'name', 'project_id')
87-
self.assertEqual(columns, collist)
87+
self.assertEqual(collist, columns)
8888
datalist = (
8989
identity_fakes.user_email,
9090
True,
9191
identity_fakes.user_id,
9292
identity_fakes.user_name,
9393
identity_fakes.project_id,
9494
)
95-
self.assertEqual(data, datalist)
95+
self.assertEqual(datalist, data)
9696

9797
def test_user_create_password(self):
9898
arglist = [
@@ -123,15 +123,15 @@ def test_user_create_password(self):
123123
)
124124

125125
collist = ('email', 'enabled', 'id', 'name', 'project_id')
126-
self.assertEqual(columns, collist)
126+
self.assertEqual(collist, columns)
127127
datalist = (
128128
identity_fakes.user_email,
129129
True,
130130
identity_fakes.user_id,
131131
identity_fakes.user_name,
132132
identity_fakes.project_id,
133133
)
134-
self.assertEqual(data, datalist)
134+
self.assertEqual(datalist, data)
135135

136136
def test_user_create_password_prompt(self):
137137
arglist = [
@@ -164,15 +164,15 @@ def test_user_create_password_prompt(self):
164164
)
165165

166166
collist = ('email', 'enabled', 'id', 'name', 'project_id')
167-
self.assertEqual(columns, collist)
167+
self.assertEqual(collist, columns)
168168
datalist = (
169169
identity_fakes.user_email,
170170
True,
171171
identity_fakes.user_id,
172172
identity_fakes.user_name,
173173
identity_fakes.project_id,
174174
)
175-
self.assertEqual(data, datalist)
175+
self.assertEqual(datalist, data)
176176

177177
def test_user_create_email(self):
178178
arglist = [
@@ -202,15 +202,15 @@ def test_user_create_email(self):
202202
)
203203

204204
collist = ('email', 'enabled', 'id', 'name', 'project_id')
205-
self.assertEqual(columns, collist)
205+
self.assertEqual(collist, columns)
206206
datalist = (
207207
identity_fakes.user_email,
208208
True,
209209
identity_fakes.user_id,
210210
identity_fakes.user_name,
211211
identity_fakes.project_id,
212212
)
213-
self.assertEqual(data, datalist)
213+
self.assertEqual(datalist, data)
214214

215215
def test_user_create_project(self):
216216
# Return the new project
@@ -255,15 +255,15 @@ def test_user_create_project(self):
255255
)
256256

257257
collist = ('email', 'enabled', 'id', 'name', 'project_id')
258-
self.assertEqual(columns, collist)
258+
self.assertEqual(collist, columns)
259259
datalist = (
260260
identity_fakes.user_email,
261261
True,
262262
identity_fakes.user_id,
263263
identity_fakes.user_name,
264264
identity_fakes.PROJECT_2['id'],
265265
)
266-
self.assertEqual(data, datalist)
266+
self.assertEqual(datalist, data)
267267

268268
def test_user_create_enable(self):
269269
arglist = [
@@ -294,15 +294,15 @@ def test_user_create_enable(self):
294294
)
295295

296296
collist = ('email', 'enabled', 'id', 'name', 'project_id')
297-
self.assertEqual(columns, collist)
297+
self.assertEqual(collist, columns)
298298
datalist = (
299299
identity_fakes.user_email,
300300
True,
301301
identity_fakes.user_id,
302302
identity_fakes.user_name,
303303
identity_fakes.project_id,
304304
)
305-
self.assertEqual(data, datalist)
305+
self.assertEqual(datalist, data)
306306

307307
def test_user_create_disable(self):
308308
arglist = [
@@ -333,15 +333,15 @@ def test_user_create_disable(self):
333333
)
334334

335335
collist = ('email', 'enabled', 'id', 'name', 'project_id')
336-
self.assertEqual(columns, collist)
336+
self.assertEqual(collist, columns)
337337
datalist = (
338338
identity_fakes.user_email,
339339
True,
340340
identity_fakes.user_id,
341341
identity_fakes.user_name,
342342
identity_fakes.project_id,
343343
)
344-
self.assertEqual(data, datalist)
344+
self.assertEqual(datalist, data)
345345

346346
def test_user_create_or_show_exists(self):
347347
def _raise_conflict(*args, **kwargs):
@@ -495,12 +495,12 @@ def test_user_list_no_options(self):
495495
self.users_mock.list.assert_called_with(tenant_id=None)
496496

497497
collist = ('ID', 'Name')
498-
self.assertEqual(columns, collist)
498+
self.assertEqual(collist, columns)
499499
datalist = ((
500500
identity_fakes.user_id,
501501
identity_fakes.user_name,
502502
), )
503-
self.assertEqual(tuple(data), datalist)
503+
self.assertEqual(datalist, tuple(data))
504504

505505
def test_user_list_project(self):
506506
arglist = [
@@ -518,12 +518,12 @@ def test_user_list_project(self):
518518
self.users_mock.list.assert_called_with(tenant_id=project_id)
519519

520520
collist = ('ID', 'Name')
521-
self.assertEqual(columns, collist)
521+
self.assertEqual(collist, columns)
522522
datalist = ((
523523
identity_fakes.user_id,
524524
identity_fakes.user_name,
525525
), )
526-
self.assertEqual(tuple(data), datalist)
526+
self.assertEqual(datalist, tuple(data))
527527

528528
def test_user_list_long(self):
529529
arglist = [
@@ -540,15 +540,15 @@ def test_user_list_long(self):
540540
self.users_mock.list.assert_called_with(tenant_id=None)
541541

542542
collist = ('ID', 'Name', 'Project', 'Email', 'Enabled')
543-
self.assertEqual(columns, collist)
543+
self.assertEqual(collist, columns)
544544
datalist = ((
545545
identity_fakes.user_id,
546546
identity_fakes.user_name,
547547
identity_fakes.project_name,
548548
identity_fakes.user_email,
549549
True,
550550
), )
551-
self.assertEqual(tuple(data), datalist)
551+
self.assertEqual(datalist, tuple(data))
552552

553553

554554
class TestUserSet(TestUser):
@@ -816,12 +816,12 @@ def test_user_show(self):
816816
self.users_mock.get.assert_called_with(identity_fakes.user_id)
817817

818818
collist = ('email', 'enabled', 'id', 'name', 'project_id')
819-
self.assertEqual(columns, collist)
819+
self.assertEqual(collist, columns)
820820
datalist = (
821821
identity_fakes.user_email,
822822
True,
823823
identity_fakes.user_id,
824824
identity_fakes.user_name,
825825
identity_fakes.project_id,
826826
)
827-
self.assertEqual(data, datalist)
827+
self.assertEqual(datalist, data)

0 commit comments

Comments
 (0)