Skip to content

Commit 4185398

Browse files
author
Tang Chen
committed
Use assert_called_once_with() instead of assert_called_with()
If one API is only called once, we'd better use assert_called_once_with() to check the call. Change-Id: Id05055bb90592d218826732259ed84fc366734ce
1 parent 98dc781 commit 4185398

6 files changed

Lines changed: 65 additions & 58 deletions

File tree

‎openstackclient/tests/network/v2/test_floating_ip.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ def test_floating_ip_delete(self):
5454

5555
result = self.cmd.take_action(parsed_args)
5656

57-
self.network.find_ip.assert_called_with(self.floating_ip.id)
58-
self.network.delete_ip.assert_called_with(self.floating_ip)
57+
self.network.find_ip.assert_called_once_with(self.floating_ip.id)
58+
self.network.delete_ip.assert_called_once_with(self.floating_ip)
5959
self.assertIsNone(result)
6060

6161

@@ -95,7 +95,7 @@ def test_floating_ip_list(self):
9595

9696
columns, data = self.cmd.take_action(parsed_args)
9797

98-
self.network.ips.assert_called_with(**{})
98+
self.network.ips.assert_called_once_with(**{})
9999
self.assertEqual(self.columns, columns)
100100
self.assertEqual(self.data, list(data))
101101

@@ -150,7 +150,7 @@ def test_floating_ip_show(self):
150150

151151
columns, data = self.cmd.take_action(parsed_args)
152152

153-
self.network.find_ip.assert_called_with(
153+
self.network.find_ip.assert_called_once_with(
154154
self.floating_ip.id,
155155
ignore_missing=False
156156
)
@@ -198,7 +198,7 @@ def test_floating_ip_delete(self):
198198

199199
result = self.cmd.take_action(parsed_args)
200200

201-
self.compute.floating_ips.delete.assert_called_with(
201+
self.compute.floating_ips.delete.assert_called_once_with(
202202
self.floating_ip.id
203203
)
204204
self.assertIsNone(result)
@@ -244,7 +244,7 @@ def test_floating_ip_list(self):
244244

245245
columns, data = self.cmd.take_action(parsed_args)
246246

247-
self.compute.floating_ips.list.assert_called_with()
247+
self.compute.floating_ips.list.assert_called_once_with()
248248
self.assertEqual(self.columns, columns)
249249
self.assertEqual(self.data, list(data))
250250

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

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def test_create_default_options(self):
124124
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
125125
columns, data = self.cmd.take_action(parsed_args)
126126

127-
self.network.create_network.assert_called_with(**{
127+
self.network.create_network.assert_called_once_with(**{
128128
'admin_state_up': True,
129129
'name': self._network.name,
130130
})
@@ -152,7 +152,7 @@ def test_create_all_options(self):
152152
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
153153
columns, data = (self.cmd.take_action(parsed_args))
154154

155-
self.network.create_network.assert_called_with(**{
155+
self.network.create_network.assert_called_once_with(**{
156156
'admin_state_up': False,
157157
'availability_zone_hints': ["nova"],
158158
'name': self._network.name,
@@ -177,7 +177,7 @@ def test_create_other_options(self):
177177
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
178178
columns, data = self.cmd.take_action(parsed_args)
179179

180-
self.network.create_network.assert_called_with(**{
180+
self.network.create_network.assert_called_once_with(**{
181181
'admin_state_up': True,
182182
'name': self._network.name,
183183
'shared': False,
@@ -258,7 +258,7 @@ def test_create_with_project_identityv2(self):
258258
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
259259
columns, data = self.cmd.take_action(parsed_args)
260260

261-
self.network.create_network.assert_called_with(**{
261+
self.network.create_network.assert_called_once_with(**{
262262
'admin_state_up': True,
263263
'name': self._network.name,
264264
'tenant_id': identity_fakes_v2.project_id,
@@ -315,7 +315,7 @@ def test_delete(self):
315315
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
316316
result = self.cmd.take_action(parsed_args)
317317

318-
self.network.delete_network.assert_called_with(self._network)
318+
self.network.delete_network.assert_called_once_with(self._network)
319319
self.assertIsNone(result)
320320

321321

@@ -386,7 +386,7 @@ def test_network_list_no_options(self):
386386
# containing the data to be listed.
387387
columns, data = self.cmd.take_action(parsed_args)
388388

389-
self.network.networks.assert_called_with()
389+
self.network.networks.assert_called_once_with()
390390
self.assertEqual(self.columns, columns)
391391
self.assertEqual(self.data, list(data))
392392

@@ -405,7 +405,7 @@ def test_list_external(self):
405405
# containing the data to be listed.
406406
columns, data = self.cmd.take_action(parsed_args)
407407

408-
self.network.networks.assert_called_with(
408+
self.network.networks.assert_called_once_with(
409409
**{'router:external': True}
410410
)
411411
self.assertEqual(self.columns, columns)
@@ -426,7 +426,7 @@ def test_network_list_long(self):
426426
# containing the data to be listed.
427427
columns, data = self.cmd.take_action(parsed_args)
428428

429-
self.network.networks.assert_called_with()
429+
self.network.networks.assert_called_once_with()
430430
self.assertEqual(self.columns_long, columns)
431431
self.assertEqual(self.data_long, list(data))
432432

@@ -468,7 +468,8 @@ def test_set_this(self):
468468
'admin_state_up': True,
469469
'shared': True,
470470
}
471-
self.network.update_network.assert_called_with(self._network, **attrs)
471+
self.network.update_network.assert_called_once_with(
472+
self._network, **attrs)
472473
self.assertIsNone(result)
473474

474475
def test_set_that(self):
@@ -490,7 +491,8 @@ def test_set_that(self):
490491
'admin_state_up': False,
491492
'shared': False,
492493
}
493-
self.network.update_network.assert_called_with(self._network, **attrs)
494+
self.network.update_network.assert_called_once_with(
495+
self._network, **attrs)
494496
self.assertIsNone(result)
495497

496498
def test_set_nothing(self):
@@ -558,8 +560,8 @@ def test_show_all_options(self):
558560
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
559561
columns, data = self.cmd.take_action(parsed_args)
560562

561-
self.network.find_network.assert_called_with(self._network.name,
562-
ignore_missing=False)
563+
self.network.find_network.assert_called_once_with(
564+
self._network.name, ignore_missing=False)
563565

564566
self.assertEqual(tuple(self.columns), columns)
565567
self.assertEqual(list(self.data), list(data))
@@ -682,7 +684,7 @@ def test_create_default_options(self):
682684

683685
columns, data = self.cmd.take_action(parsed_args)
684686

685-
self.compute.networks.create.assert_called_with(**{
687+
self.compute.networks.create.assert_called_once_with(**{
686688
'cidr': self._network.cidr,
687689
'label': self._network.label,
688690
})
@@ -719,7 +721,7 @@ def test_network_delete(self):
719721
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
720722
result = self.cmd.take_action(parsed_args)
721723

722-
self.compute.networks.delete.assert_called_with(self._network.id)
724+
self.compute.networks.delete.assert_called_once_with(self._network.id)
723725
self.assertIsNone(result)
724726

725727

@@ -765,7 +767,7 @@ def test_network_list_no_options(self):
765767
# containing the data to be listed.
766768
columns, data = self.cmd.take_action(parsed_args)
767769

768-
self.compute.networks.list.assert_called_with()
770+
self.compute.networks.list.assert_called_once_with()
769771
self.assertEqual(self.columns, columns)
770772
self.assertEqual(self.data, list(data))
771773

‎openstackclient/tests/network/v2/test_port.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def test_create_default_options(self):
110110

111111
columns, data = (self.cmd.take_action(parsed_args))
112112

113-
self.network.create_port.assert_called_with(**{
113+
self.network.create_port.assert_called_once_with(**{
114114
'admin_state_up': True,
115115
'network_id': self._port.network_id,
116116
'name': 'test-port',
@@ -154,7 +154,7 @@ def test_create_full_options(self):
154154

155155
columns, data = (self.cmd.take_action(parsed_args))
156156

157-
self.network.create_port.assert_called_with(**{
157+
self.network.create_port.assert_called_once_with(**{
158158
'mac_address': 'aa:aa:aa:aa:aa:aa',
159159
'fixed_ips': [{'subnet_id': self.fake_subnet.id,
160160
'ip_address': '10.0.0.2'}],
@@ -195,7 +195,7 @@ def test_delete(self):
195195
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
196196

197197
result = self.cmd.take_action(parsed_args)
198-
self.network.delete_port.assert_called_with(self._port)
198+
self.network.delete_port.assert_called_once_with(self._port)
199199
self.assertIsNone(result)
200200

201201

@@ -238,7 +238,7 @@ def test_port_list_no_options(self):
238238

239239
columns, data = self.cmd.take_action(parsed_args)
240240

241-
self.network.ports.assert_called_with()
241+
self.network.ports.assert_called_once_with()
242242
self.assertEqual(self.columns, columns)
243243
self.assertEqual(self.data, list(data))
244244

@@ -255,7 +255,7 @@ def test_port_list_router_opt(self):
255255

256256
columns, data = self.cmd.take_action(parsed_args)
257257

258-
self.network.ports.assert_called_with(**{
258+
self.network.ports.assert_called_once_with(**{
259259
'device_id': 'fake-router-id'
260260
})
261261
self.assertEqual(self.columns, columns)
@@ -292,7 +292,7 @@ def test_set_fixed_ip(self):
292292
attrs = {
293293
'fixed_ips': [{'ip_address': '10.0.0.11'}],
294294
}
295-
self.network.update_port.assert_called_with(self._port, **attrs)
295+
self.network.update_port.assert_called_once_with(self._port, **attrs)
296296
self.assertIsNone(result)
297297

298298
def test_set_this(self):
@@ -310,7 +310,7 @@ def test_set_this(self):
310310
attrs = {
311311
'admin_state_up': False,
312312
}
313-
self.network.update_port.assert_called_with(self._port, **attrs)
313+
self.network.update_port.assert_called_once_with(self._port, **attrs)
314314
self.assertIsNone(result)
315315

316316
def test_set_that(self):
@@ -337,7 +337,7 @@ def test_set_that(self):
337337
'binding:profile': {'foo': 'bar'},
338338
'binding:host_id': 'binding-host-id-xxxx',
339339
}
340-
self.network.update_port.assert_called_with(self._port, **attrs)
340+
self.network.update_port.assert_called_once_with(self._port, **attrs)
341341
self.assertIsNone(result)
342342

343343

@@ -372,8 +372,8 @@ def test_show_all_options(self):
372372

373373
columns, data = self.cmd.take_action(parsed_args)
374374

375-
self.network.find_port.assert_called_with(self._port.name,
376-
ignore_missing=False)
375+
self.network.find_port.assert_called_once_with(
376+
self._port.name, ignore_missing=False)
377377

378378
ref_columns, ref_data = self._get_common_cols_data(self._port)
379379
self.assertEqual(ref_columns, columns)

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test_create_default_options(self):
8080

8181
columns, data = (self.cmd.take_action(parsed_args))
8282

83-
self.network.create_router.assert_called_with(**{
83+
self.network.create_router.assert_called_once_with(**{
8484
'admin_state_up': True,
8585
'name': self.new_router.name,
8686
'distributed': False,
@@ -103,7 +103,7 @@ def test_create_with_AZ_hints(self):
103103
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
104104

105105
columns, data = (self.cmd.take_action(parsed_args))
106-
self.network.create_router.assert_called_with(**{
106+
self.network.create_router.assert_called_once_with(**{
107107
'admin_state_up': True,
108108
'name': self.new_router.name,
109109
'distributed': False,
@@ -139,7 +139,7 @@ def test_delete(self):
139139
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
140140

141141
result = self.cmd.take_action(parsed_args)
142-
self.network.delete_router.assert_called_with(self._router)
142+
self.network.delete_router.assert_called_once_with(self._router)
143143
self.assertIsNone(result)
144144

145145

@@ -205,7 +205,7 @@ def test_router_list_no_options(self):
205205
# containing the data to be listed.
206206
columns, data = self.cmd.take_action(parsed_args)
207207

208-
self.network.routers.assert_called_with()
208+
self.network.routers.assert_called_once_with()
209209
self.assertEqual(self.columns, columns)
210210
self.assertEqual(self.data, list(data))
211211

@@ -223,7 +223,7 @@ def test_router_list_long(self):
223223
# containing the data to be listed.
224224
columns, data = self.cmd.take_action(parsed_args)
225225

226-
self.network.routers.assert_called_with()
226+
self.network.routers.assert_called_once_with()
227227
self.assertEqual(self.columns_long, columns)
228228
self.assertEqual(self.data_long, list(data))
229229

@@ -265,7 +265,8 @@ def test_set_this(self):
265265
'distributed': True,
266266
'name': 'noob',
267267
}
268-
self.network.update_router.assert_called_with(self._router, **attrs)
268+
self.network.update_router.assert_called_once_with(
269+
self._router, **attrs)
269270
self.assertIsNone(result)
270271

271272
def test_set_that(self):
@@ -287,7 +288,8 @@ def test_set_that(self):
287288
'admin_state_up': False,
288289
'distributed': False,
289290
}
290-
self.network.update_router.assert_called_with(self._router, **attrs)
291+
self.network.update_router.assert_called_once_with(
292+
self._router, **attrs)
291293
self.assertIsNone(result)
292294

293295
def test_set_distributed_centralized(self):
@@ -324,7 +326,8 @@ def test_set_route(self):
324326
'routes': [{'destination': '10.20.30.0/24',
325327
'gateway': '10.20.30.1'}],
326328
}
327-
self.network.update_router.assert_called_with(self._router, **attrs)
329+
self.network.update_router.assert_called_once_with(
330+
self._router, **attrs)
328331
self.assertIsNone(result)
329332

330333
def test_set_clear_routes(self):
@@ -343,7 +346,8 @@ def test_set_clear_routes(self):
343346
attrs = {
344347
'routes': [],
345348
}
346-
self.network.update_router.assert_called_with(self._router, **attrs)
349+
self.network.update_router.assert_called_once_with(
350+
self._router, **attrs)
347351
self.assertIsNone(result)
348352

349353
def test_set_route_clear_routes(self):
@@ -422,7 +426,7 @@ def test_show_all_options(self):
422426

423427
columns, data = self.cmd.take_action(parsed_args)
424428

425-
self.network.find_router.assert_called_with(self._router.name,
426-
ignore_missing=False)
429+
self.network.find_router.assert_called_once_with(
430+
self._router.name, ignore_missing=False)
427431
self.assertEqual(tuple(self.columns), columns)
428432
self.assertEqual(self.data, data)

0 commit comments

Comments
 (0)