Skip to content

Commit 5bec3b7

Browse files
author
liuyamin
committed
Replace assertEqual(True/False, expr) with assertTrue/assertFalse
In some cases, If the result of expr is a boolen value, we shoud use assertTrue/assertFalse to instead. Because it is clear and simple. Change-Id: I53b345fc3915a7b0e737e9dd4d58fe09c746d61c
1 parent b90c780 commit 5bec3b7

8 files changed

Lines changed: 41 additions & 136 deletions

File tree

‎openstackclient/tests/functional/compute/v2/test_flavor.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ def test_flavor_list(self):
112112
0,
113113
cmd_output["disk"],
114114
)
115-
self.assertEqual(
116-
False,
115+
self.assertFalse(
117116
cmd_output["os-flavor-access:is_public"],
118117
)
119118
self.assertEqual(
@@ -199,8 +198,7 @@ def test_flavor_properties(self):
199198
20,
200199
cmd_output["disk"],
201200
)
202-
self.assertEqual(
203-
False,
201+
self.assertFalse(
204202
cmd_output["os-flavor-access:is_public"],
205203
)
206204
self.assertEqual(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def test_project_set(self):
7272
self.assert_show_fields(items, fields)
7373
project = self.parse_show_as_object(raw_output)
7474
self.assertEqual(new_project_name, project['name'])
75-
self.assertEqual('False', project['enabled'])
75+
self.assertFalse(project['enabled'])
7676
self.assertEqual("k0='v0'", project['properties'])
7777

7878
def test_project_show(self):

‎openstackclient/tests/functional/network/v2/test_address_scope.py‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ def test_address_scope_delete(self):
4242
cmd_output['name'],
4343
)
4444
# Check the default values
45-
self.assertEqual(
46-
False,
47-
cmd_output['shared'],
48-
)
45+
self.assertFalse(cmd_output['shared'])
4946

5047
name2 = uuid.uuid4().hex
5148
cmd_output = json.loads(self.openstack(
@@ -80,10 +77,7 @@ def test_address_scope_list(self):
8077
4,
8178
cmd_output['ip_version'],
8279
)
83-
self.assertEqual(
84-
True,
85-
cmd_output['shared'],
86-
)
80+
self.assertTrue(cmd_output['shared'])
8781

8882
name2 = uuid.uuid4().hex
8983
cmd_output = json.loads(self.openstack(
@@ -101,10 +95,7 @@ def test_address_scope_list(self):
10195
6,
10296
cmd_output['ip_version'],
10397
)
104-
self.assertEqual(
105-
False,
106-
cmd_output['shared'],
107-
)
98+
self.assertFalse(cmd_output['shared'])
10899

109100
# Test list
110101
cmd_output = json.loads(self.openstack(
@@ -149,10 +140,7 @@ def test_address_scope_set(self):
149140
4,
150141
cmd_output['ip_version'],
151142
)
152-
self.assertEqual(
153-
False,
154-
cmd_output['shared'],
155-
)
143+
self.assertFalse(cmd_output['shared'])
156144

157145
raw_output = self.openstack(
158146
'address scope set ' +
@@ -174,7 +162,4 @@ def test_address_scope_set(self):
174162
4,
175163
cmd_output['ip_version'],
176164
)
177-
self.assertEqual(
178-
True,
179-
cmd_output['shared'],
180-
)
165+
self.assertTrue(cmd_output['shared'])

‎openstackclient/tests/functional/network/v2/test_network.py‎

Lines changed: 18 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ def test_network_create_compute(self):
7070
'1.2.4.0/28',
7171
cmd_output["cidr"],
7272
)
73-
self.assertEqual(
74-
True,
73+
self.assertTrue(
7574
cmd_output["share_address"],
7675
)
7776

@@ -124,8 +123,7 @@ def test_network_create_network(self):
124123
'UP',
125124
cmd_output["admin_state_up"],
126125
)
127-
self.assertEqual(
128-
False,
126+
self.assertFalse(
129127
cmd_output["shared"],
130128
)
131129
self.assertEqual(
@@ -236,21 +234,14 @@ def test_network_list(self):
236234
'UP',
237235
cmd_output["admin_state_up"],
238236
)
239-
self.assertEqual(
240-
False,
241-
cmd_output["shared"],
242-
)
237+
self.assertFalse(cmd_output["shared"])
243238
self.assertEqual(
244239
'Internal',
245240
cmd_output["router:external"],
246241
)
247-
self.assertEqual(
248-
False,
249-
cmd_output["is_default"],
250-
)
251-
self.assertEqual(
252-
True,
253-
cmd_output["port_security_enabled"],
242+
self.assertFalse(cmd_output["is_default"])
243+
self.assertTrue(
244+
cmd_output["port_security_enabled"]
254245
)
255246
else:
256247
self.assertEqual(
@@ -278,27 +269,15 @@ def test_network_list(self):
278269
'DOWN',
279270
cmd_output["admin_state_up"],
280271
)
281-
self.assertEqual(
282-
True,
283-
cmd_output["shared"],
284-
)
285-
self.assertEqual(
286-
False,
287-
cmd_output["is_default"],
288-
)
289-
self.assertEqual(
290-
True,
291-
cmd_output["port_security_enabled"],
292-
)
272+
self.assertTrue(cmd_output["shared"])
273+
self.assertFalse(cmd_output["is_default"])
274+
self.assertTrue(cmd_output["port_security_enabled"])
293275
else:
294276
self.assertEqual(
295277
'4.5.6.0/28',
296278
cmd_output["cidr"],
297279
)
298-
self.assertEqual(
299-
True,
300-
cmd_output["share_address"],
301-
)
280+
self.assertTrue(cmd_output["share_address"])
302281

303282
# Test list
304283
cmd_output = json.loads(self.openstack(
@@ -422,22 +401,15 @@ def test_network_set(self):
422401
'UP',
423402
cmd_output["admin_state_up"],
424403
)
425-
self.assertEqual(
426-
False,
427-
cmd_output["shared"],
428-
)
404+
self.assertFalse(cmd_output["shared"])
429405
self.assertEqual(
430406
'Internal',
431407
cmd_output["router:external"],
432408
)
433409

434-
self.assertEqual(
435-
False,
436-
cmd_output["is_default"],
437-
)
438-
self.assertEqual(
439-
True,
440-
cmd_output["port_security_enabled"],
410+
self.assertFalse(cmd_output["is_default"])
411+
self.assertTrue(
412+
cmd_output["port_security_enabled"]
441413
)
442414

443415
raw_output = self.openstack(
@@ -463,19 +435,12 @@ def test_network_set(self):
463435
'DOWN',
464436
cmd_output["admin_state_up"],
465437
)
466-
self.assertEqual(
467-
True,
468-
cmd_output["shared"],
469-
)
438+
self.assertTrue(cmd_output["shared"])
470439
self.assertEqual(
471440
'External',
472441
cmd_output["router:external"],
473442
)
474-
self.assertEqual(
475-
False,
476-
cmd_output["is_default"],
477-
)
478-
self.assertEqual(
479-
False,
480-
cmd_output["port_security_enabled"],
443+
self.assertFalse(cmd_output["is_default"])
444+
self.assertFalse(
445+
cmd_output["port_security_enabled"]
481446
)

‎openstackclient/tests/functional/network/v2/test_network_flavor.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,7 @@ def test_network_flavor_delete(self):
8787
name1,
8888
cmd_output['name'],
8989
)
90-
self.assertEqual(
91-
True,
92-
cmd_output['enabled'],
93-
)
90+
self.assertTrue(cmd_output['enabled'])
9491
self.assertEqual(
9592
'testdescription',
9693
cmd_output['description'],
@@ -105,10 +102,7 @@ def test_network_flavor_delete(self):
105102
name2,
106103
cmd_output['name'],
107104
)
108-
self.assertEqual(
109-
False,
110-
cmd_output['enabled'],
111-
)
105+
self.assertFalse(cmd_output['enabled'])
112106
self.assertEqual(
113107
'testdescription1',
114108
cmd_output['description'],

‎openstackclient/tests/functional/network/v2/test_network_flavor_profile.py‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ def test_network_flavor_profile_create(self):
3535
))
3636
ID = json_output.get('id')
3737
self.assertIsNotNone(ID)
38-
self.assertEqual(
39-
True,
40-
json_output.get('enabled'),
41-
)
38+
self.assertTrue(json_output.get('enabled'))
4239
self.assertEqual(
4340
'fakedescription',
4441
json_output.get('description'),
@@ -61,10 +58,7 @@ def test_network_flavor_profile_list(self):
6158
))
6259
ID1 = json_output.get('id')
6360
self.assertIsNotNone(ID1)
64-
self.assertEqual(
65-
True,
66-
json_output.get('enabled'),
67-
)
61+
self.assertTrue(json_output.get('enabled'))
6862
self.assertEqual(
6963
'fakedescription',
7064
json_output.get('description'),
@@ -82,10 +76,7 @@ def test_network_flavor_profile_list(self):
8276
))
8377
ID2 = json_output.get('id')
8478
self.assertIsNotNone(ID2)
85-
self.assertEqual(
86-
False,
87-
json_output.get('enabled'),
88-
)
79+
self.assertFalse(json_output.get('enabled'))
8980
self.assertEqual(
9081
'fakedescription',
9182
json_output.get('description'),
@@ -120,10 +111,7 @@ def test_network_flavor_profile_set(self):
120111
))
121112
ID = json_output_1.get('id')
122113
self.assertIsNotNone(ID)
123-
self.assertEqual(
124-
True,
125-
json_output_1.get('enabled'),
126-
)
114+
self.assertTrue(json_output_1.get('enabled'))
127115
self.assertEqual(
128116
'fakedescription',
129117
json_output_1.get('description'),
@@ -138,10 +126,7 @@ def test_network_flavor_profile_set(self):
138126
json_output = json.loads(self.openstack(
139127
'network flavor profile show -f json ' + ID
140128
))
141-
self.assertEqual(
142-
False,
143-
json_output.get('enabled'),
144-
)
129+
self.assertFalse(json_output.get('enabled'))
145130
self.assertEqual(
146131
'fakedescription',
147132
json_output.get('description'),
@@ -171,10 +156,7 @@ def test_network_flavor_profile_show(self):
171156
ID,
172157
json_output["id"],
173158
)
174-
self.assertEqual(
175-
True,
176-
json_output["enabled"],
177-
)
159+
self.assertTrue(json_output["enabled"])
178160
self.assertEqual(
179161
'fakedescription',
180162
json_output["description"],

‎openstackclient/tests/functional/network/v2/test_network_meter.py‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ def test_meter_delete(self):
4848
json_output.get('name'),
4949
)
5050
# Check if default shared values
51-
self.assertEqual(
52-
False,
53-
json_output.get('shared'),
54-
)
51+
self.assertFalse(json_output.get('shared'))
5552
self.assertEqual(
5653
'fakedescription',
5754
json_output.get('description'),
@@ -67,10 +64,7 @@ def test_meter_delete(self):
6764
json_output_2.get('name'),
6865
)
6966
# Check if default shared values
70-
self.assertEqual(
71-
False,
72-
json_output_2.get('shared'),
73-
)
67+
self.assertFalse(json_output_2.get('shared'))
7468
self.assertEqual(
7569
'fakedescription',
7670
json_output_2.get('description'),
@@ -99,10 +93,7 @@ def test_meter_list(self):
9993
'Test1',
10094
json_output.get('description'),
10195
)
102-
self.assertEqual(
103-
True,
104-
json_output.get('shared'),
105-
)
96+
self.assertTrue(json_output.get('shared'))
10697

10798
name2 = uuid.uuid4().hex
10899
json_output_2 = json.loads(self.openstack(
@@ -117,8 +108,7 @@ def test_meter_list(self):
117108
'Test2',
118109
json_output_2.get('description'),
119110
)
120-
self.assertEqual(
121-
False,
111+
self.assertFalse(
122112
json_output_2.get('shared'),
123113
)
124114

@@ -143,10 +133,7 @@ def test_meter_show(self):
143133
json_output = json.loads(self.openstack(
144134
'network meter show -f json ' + meter_id
145135
))
146-
self.assertEqual(
147-
False,
148-
json_output.get('shared'),
149-
)
136+
self.assertFalse(json_output.get('shared'))
150137
self.assertEqual(
151138
'fakedescription',
152139
json_output.get('description'),
@@ -164,10 +151,7 @@ def test_meter_show(self):
164151
meter_id,
165152
json_output.get('id'),
166153
)
167-
self.assertEqual(
168-
False,
169-
json_output.get('shared'),
170-
)
154+
self.assertFalse(json_output.get('shared'))
171155
self.assertEqual(
172156
'fakedescription',
173157
json_output.get('description'),

‎openstackclient/tests/functional/network/v2/test_router.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,7 @@ def test_router_set_show_unset(self):
247247
'router show -f json ' +
248248
new_name
249249
))
250-
self.assertEqual(
251-
True,
252-
cmd_output["distributed"],
253-
)
250+
self.assertTrue(cmd_output["distributed"])
254251
self.assertIsNotNone(cmd_output["external_gateway_info"])
255252

256253
# Test unset

0 commit comments

Comments
 (0)