Skip to content

Commit 6dc17bb

Browse files
committed
Make test_server.py more elegant and simple
Use only one line for mocking network resources like ports and networks in test_server.py. Change-Id: I451a504c3afdd365e64d66079516ec6308c206db Depends-On: I624b1bc557a195bdf8a7c5a32dc0e72a6fa8b075
1 parent 8549071 commit 6dc17bb

1 file changed

Lines changed: 7 additions & 14 deletions

File tree

openstackclient/tests/unit/compute/v2/test_server.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -413,24 +413,18 @@ def test_server_create_with_network(self):
413413
network_client = self.app.client_manager.network
414414
network_client.find_network = find_network
415415
network_client.find_port = find_port
416-
network_resource = mock.Mock()
417-
network_resource.id = 'net1_uuid'
418-
port1_resource = mock.Mock()
419-
port1_resource.id = 'port1_uuid'
420-
port2_resource = mock.Mock()
421-
port2_resource.id = 'port2_uuid'
416+
network_resource = mock.Mock(id='net1_uuid')
417+
port1_resource = mock.Mock(id='port1_uuid')
418+
port2_resource = mock.Mock(id='port2_uuid')
422419
find_network.return_value = network_resource
423420
find_port.side_effect = (lambda port_id, ignore_missing:
424421
{"port1": port1_resource,
425422
"port2": port2_resource}[port_id])
426423

427424
# Mock sdk APIs.
428-
_network = mock.Mock()
429-
_network.id = 'net1_uuid'
430-
_port1 = mock.Mock()
431-
_port1.id = 'port1_uuid'
432-
_port2 = mock.Mock()
433-
_port2.id = 'port2_uuid'
425+
_network = mock.Mock(id='net1_uuid')
426+
_port1 = mock.Mock(id='port1_uuid')
427+
_port2 = mock.Mock(id='port2_uuid')
434428
find_network = mock.Mock()
435429
find_port = mock.Mock()
436430
find_network.return_value = _network
@@ -609,8 +603,7 @@ def test_server_create_with_conflict_network_options(self):
609603
find_port = mock.Mock()
610604
network_client = self.app.client_manager.network
611605
network_client.find_port = find_port
612-
port_resource = mock.Mock()
613-
port_resource.id = 'port1_uuid'
606+
port_resource = mock.Mock(id='port1_uuid')
614607
find_port.return_value = port_resource
615608

616609
self.assertRaises(exceptions.CommandError,

0 commit comments

Comments
 (0)