openstack/python-openstackclient
Code Issues Proposed changes

Merge "tests: Avoid unnecessary mocks"

Browse Source
This commit is contained in:
Zuul
2025-08-15 04:48:40 +00:00
committed by Gerrit Code Review
parent 87fe04ae08 a99ae364fc
commit 37228ae2d3
1 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
openstackclient/tests/unit/compute/v2/test_server.py
View File

@@ -89,10 +89,6 @@ class TestServerAddFixedIP(TestServer):
# Get the command object to test # Get the command object to test
self.cmd = server.AddFixedIP(self.app, None) self.cmd = server.AddFixedIP(self.app, None)
# Mock network methods
self.find_network = mock.Mock()
self.app.client_manager.network.find_network = self.find_network
def test_server_add_fixed_ip_pre_v249_with_tag(self): def test_server_add_fixed_ip_pre_v249_with_tag(self):
self.set_compute_api_version('2.48') self.set_compute_api_version('2.48')
@@ -614,9 +610,6 @@ class TestServerAddPort(TestServer):
# Get the command object to test # Get the command object to test
self.cmd = server.AddPort(self.app, None) self.cmd = server.AddPort(self.app, None)
self.find_port = mock.Mock()
self.app.client_manager.network.find_port = self.find_port
def _test_server_add_port(self, port_id): def _test_server_add_port(self, port_id):
servers = self.setup_sdk_servers_mock(count=1) servers = self.setup_sdk_servers_mock(count=1)
port = 'fake-port' port = 'fake-port'
@@ -636,21 +629,23 @@ class TestServerAddPort(TestServer):
self.assertIsNone(result) self.assertIsNone(result)
def test_server_add_port(self): def test_server_add_port(self):
self._test_server_add_port(self.find_port.return_value.id) self._test_server_add_port(
self.find_port.assert_called_once_with( self.network_client.find_port.return_value.id
)
self.network_client.find_port.assert_called_once_with(
'fake-port', ignore_missing=False 'fake-port', ignore_missing=False
) )
def test_server_add_port_no_neutron(self): def test_server_add_port_no_neutron(self):
self.app.client_manager.network_endpoint_enabled = False self.app.client_manager.network_endpoint_enabled = False
self._test_server_add_port('fake-port') self._test_server_add_port('fake-port')
self.find_port.assert_not_called() self.network_client.find_port.assert_not_called()
def test_server_add_port_with_tag(self): def test_server_add_port_with_tag(self):
self.set_compute_api_version('2.49') self.set_compute_api_version('2.49')
servers = self.setup_sdk_servers_mock(count=1) servers = self.setup_sdk_servers_mock(count=1)
self.find_port.return_value.id = 'fake-port' self.network_client.find_port.return_value.id = 'fake-port'
arglist = [ arglist = [
servers[0].id, servers[0].id,
'fake-port', 'fake-port',
@@ -675,7 +670,7 @@ class TestServerAddPort(TestServer):
self.set_compute_api_version('2.48') self.set_compute_api_version('2.48')
servers = self.setup_sdk_servers_mock(count=1) servers = self.setup_sdk_servers_mock(count=1)
self.find_port.return_value.id = 'fake-port' self.network_client.find_port.return_value.id = 'fake-port'
arglist = [ arglist = [
servers[0].id, servers[0].id,
'fake-port', 'fake-port',
@@ -1038,9 +1033,6 @@ class TestServerAddNetwork(TestServer):
# Get the command object to test # Get the command object to test
self.cmd = server.AddNetwork(self.app, None) self.cmd = server.AddNetwork(self.app, None)
self.find_network = mock.Mock()
self.app.client_manager.network.find_network = self.find_network
def _test_server_add_network(self, net_id): def _test_server_add_network(self, net_id):
servers = self.setup_sdk_servers_mock(count=1) servers = self.setup_sdk_servers_mock(count=1)
network = 'fake-network' network = 'fake-network'
@@ -1060,21 +1052,23 @@ class TestServerAddNetwork(TestServer):
self.assertIsNone(result) self.assertIsNone(result)
def test_server_add_network(self): def test_server_add_network(self):
self._test_server_add_network(self.find_network.return_value.id) self._test_server_add_network(
self.find_network.assert_called_once_with( self.network_client.find_network.return_value.id
)
self.network_client.find_network.assert_called_once_with(
'fake-network', ignore_missing=False 'fake-network', ignore_missing=False
) )
def test_server_add_network_no_neutron(self): def test_server_add_network_no_neutron(self):
self.app.client_manager.network_endpoint_enabled = False self.app.client_manager.network_endpoint_enabled = False
self._test_server_add_network('fake-network') self._test_server_add_network('fake-network')
self.find_network.assert_not_called() self.network_client.find_network.assert_not_called()
def test_server_add_network_with_tag(self): def test_server_add_network_with_tag(self):
self.set_compute_api_version('2.49') self.set_compute_api_version('2.49')
servers = self.setup_sdk_servers_mock(count=1) servers = self.setup_sdk_servers_mock(count=1)
self.find_network.return_value.id = 'fake-network' self.network_client.find_network.return_value.id = 'fake-network'
arglist = [ arglist = [
servers[0].id, servers[0].id,
@@ -1100,7 +1094,7 @@ class TestServerAddNetwork(TestServer):
self.set_compute_api_version('2.48') self.set_compute_api_version('2.48')
servers = self.setup_sdk_servers_mock(count=1) servers = self.setup_sdk_servers_mock(count=1)
self.find_network.return_value.id = 'fake-network' self.network_client.find_network.return_value.id = 'fake-network'
arglist = [ arglist = [
servers[0].id, servers[0].id,
@@ -7391,9 +7385,6 @@ class TestServerRemovePort(TestServer):
# Get the command object to test # Get the command object to test
self.cmd = server.RemovePort(self.app, None) self.cmd = server.RemovePort(self.app, None)
self.find_port = mock.Mock()
self.app.client_manager.network.find_port = self.find_port
def _test_server_remove_port(self, port_id): def _test_server_remove_port(self, port_id):
servers = self.setup_sdk_servers_mock(count=1) servers = self.setup_sdk_servers_mock(count=1)
port = 'fake-port' port = 'fake-port'
@@ -7416,15 +7407,17 @@ class TestServerRemovePort(TestServer):
self.assertIsNone(result) self.assertIsNone(result)
def test_server_remove_port(self): def test_server_remove_port(self):
self._test_server_remove_port(self.find_port.return_value.id) self._test_server_remove_port(
self.find_port.assert_called_once_with( self.network_client.find_port.return_value.id
)
self.network_client.find_port.assert_called_once_with(
'fake-port', ignore_missing=False 'fake-port', ignore_missing=False
) )
def test_server_remove_port_no_neutron(self): def test_server_remove_port_no_neutron(self):
self.app.client_manager.network_endpoint_enabled = False self.app.client_manager.network_endpoint_enabled = False
self._test_server_remove_port('fake-port') self._test_server_remove_port('fake-port')
self.find_port.assert_not_called() self.network_client.find_port.assert_not_called()
class TestServerRemoveNetwork(TestServer): class TestServerRemoveNetwork(TestServer):
@@ -7434,16 +7427,12 @@ class TestServerRemoveNetwork(TestServer):
# Get the command object to test # Get the command object to test
self.cmd = server.RemoveNetwork(self.app, None) self.cmd = server.RemoveNetwork(self.app, None)
# Set method to be tested. self.fake_if = mock.Mock()
self.fake_inf = mock.Mock() self.compute_client.server_interfaces.return_value = [self.fake_if]
self.find_network = mock.Mock()
self.app.client_manager.network.find_network = self.find_network
self.compute_client.server_interfaces.return_value = [self.fake_inf]
def _test_server_remove_network(self, network_id): def _test_server_remove_network(self, network_id):
self.fake_inf.net_id = network_id self.fake_if.net_id = network_id
self.fake_inf.port_id = 'fake-port' self.fake_if.port_id = 'fake-port'
servers = self.setup_sdk_servers_mock(count=1) servers = self.setup_sdk_servers_mock(count=1)
network = 'fake-network' network = 'fake-network'
@@ -7468,15 +7457,17 @@ class TestServerRemoveNetwork(TestServer):
self.assertIsNone(result) self.assertIsNone(result)
def test_server_remove_network(self): def test_server_remove_network(self):
self._test_server_remove_network(self.find_network.return_value.id) self._test_server_remove_network(
self.find_network.assert_called_once_with( self.network_client.find_network.return_value.id
)
self.network_client.find_network.assert_called_once_with(
'fake-network', ignore_missing=False 'fake-network', ignore_missing=False
) )
def test_server_remove_network_no_neutron(self): def test_server_remove_network_no_neutron(self):
self.app.client_manager.network_endpoint_enabled = False self.app.client_manager.network_endpoint_enabled = False
self._test_server_remove_network('fake-network') self._test_server_remove_network('fake-network')
self.find_network.assert_not_called() self.network_client.find_network.assert_not_called()
class TestServerRemoveSecurityGroup(TestServer): class TestServerRemoveSecurityGroup(TestServer):