Browse Source

Merge "Remove unnecessary mocks from unit test"

changes/62/771362/20
Zuul 4 months ago
committed by Gerrit Code Review
parent
commit
b59e59da20
  1. 4
      nova/tests/unit/api/openstack/compute/test_evacuate.py
  2. 4
      nova/tests/unit/api/openstack/compute/test_migrate_server.py
  3. 5
      nova/tests/unit/api/openstack/compute/test_server_actions.py

4
nova/tests/unit/api/openstack/compute/test_evacuate.py

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import fixtures
import mock
from oslo_utils.fixture import uuidsentinel as uuids
import testtools
@ -67,9 +66,6 @@ class EvacuateTestV21(test.NoDBTestCase):
self.stub_out('nova.compute.api.API.get', fake_compute_api_get)
self.stub_out('nova.compute.api.HostAPI.service_get_by_compute_host',
fake_service_get_by_compute_host)
self.mock_list_port = self.useFixture(
fixtures.MockPatch('nova.network.neutron.API.list_ports')).mock
self.mock_list_port.return_value = {'ports': []}
self.UUID = uuids.fake
for _method in self._methods:
self.stub_out('nova.compute.api.API.%s' % _method,

4
nova/tests/unit/api/openstack/compute/test_migrate_server.py

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import fixtures
import mock
from oslo_utils.fixture import uuidsentinel as uuids
from oslo_utils import uuidutils
@ -45,9 +44,6 @@ class MigrateServerTestsV21(admin_only_action_common.CommonTests):
self.stub_out('nova.api.openstack.compute.migrate_server.'
'MigrateServerController',
lambda *a, **kw: self.controller)
self.mock_list_port = self.useFixture(
fixtures.MockPatch('nova.network.neutron.API.list_ports')).mock
self.mock_list_port.return_value = {'ports': []}
def _get_migration_body(self, **kwargs):
return {'os-migrateLive': self._get_params(**kwargs)}

5
nova/tests/unit/api/openstack/compute/test_server_actions.py

@ -14,7 +14,6 @@
# under the License.
import ddt
import fixtures
import mock
from oslo_utils.fixture import uuidsentinel as uuids
from oslo_utils import uuidutils
@ -100,10 +99,6 @@ class ServerActionsControllerTestV21(test.TestCase):
self.controller.compute_api, 'compute_task_api')
mock_conductor.start()
self.addCleanup(mock_conductor.stop)
# Assume that none of the tests are using ports with resource requests.
self.mock_list_port = self.useFixture(
fixtures.MockPatch('nova.network.neutron.API.list_ports')).mock
self.mock_list_port.return_value = {'ports': []}
def _get_controller(self):
return self.servers.ServersController()

Loading…
Cancel
Save