diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-25 15:24:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-25 15:24:07 +0000 |
| commit | bf1f47c1be5bf9f6b25eab21eb06c3b0473bf34f (patch) | |
| tree | d2ac91d16d655b70e00da0c7b8d1c60780334d48 /openstackclient | |
| parent | 7977f7df1887de570e17ed37bbb7da7b226e303d (diff) | |
| parent | 6dc17bb1fbb0b265223aff90a585be43830b1ac1 (diff) | |
| download | python-openstackclient-bf1f47c1be5bf9f6b25eab21eb06c3b0473bf34f.tar.gz | |
Merge "Make test_server.py more elegant and simple"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/unit/compute/v2/test_server.py | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py index 5d086149..9370bf6b 100644 --- a/openstackclient/tests/unit/compute/v2/test_server.py +++ b/openstackclient/tests/unit/compute/v2/test_server.py @@ -476,24 +476,18 @@ class TestServerCreate(TestServer): network_client = self.app.client_manager.network network_client.find_network = find_network network_client.find_port = find_port - network_resource = mock.Mock() - network_resource.id = 'net1_uuid' - port1_resource = mock.Mock() - port1_resource.id = 'port1_uuid' - port2_resource = mock.Mock() - port2_resource.id = 'port2_uuid' + network_resource = mock.Mock(id='net1_uuid') + port1_resource = mock.Mock(id='port1_uuid') + port2_resource = mock.Mock(id='port2_uuid') find_network.return_value = network_resource find_port.side_effect = (lambda port_id, ignore_missing: {"port1": port1_resource, "port2": port2_resource}[port_id]) # Mock sdk APIs. - _network = mock.Mock() - _network.id = 'net1_uuid' - _port1 = mock.Mock() - _port1.id = 'port1_uuid' - _port2 = mock.Mock() - _port2.id = 'port2_uuid' + _network = mock.Mock(id='net1_uuid') + _port1 = mock.Mock(id='port1_uuid') + _port2 = mock.Mock(id='port2_uuid') find_network = mock.Mock() find_port = mock.Mock() find_network.return_value = _network @@ -672,8 +666,7 @@ class TestServerCreate(TestServer): find_port = mock.Mock() network_client = self.app.client_manager.network network_client.find_port = find_port - port_resource = mock.Mock() - port_resource.id = 'port1_uuid' + port_resource = mock.Mock(id='port1_uuid') find_port.return_value = port_resource self.assertRaises(exceptions.CommandError, |