openstack/deb-python-taskflow
Code Issues Proposed changes

Merge "Stop using oslotest.mockpatch"

Browse Source
This commit is contained in:
Jenkins
2017-05-05 03:47:37 +00:00
committed by Gerrit Code Review
parent a29ebc444d faa75c475e
commit 656ed3c847
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
taskflow/test.py
View File

@@ -22,7 +22,6 @@ import logging
import fixtures
import mock
from oslotest import base
from oslotest import mockpatch
import six
from testtools import compat
@@ -198,7 +197,7 @@ class MockTestCase(TestCase):
def patch(self, target, autospec=True, **kwargs):
"""Patch target and attach it to the master mock."""
f = self.useFixture(mockpatch.Patch(target,
f = self.useFixture(fixtures.MockPatch(target,
autospec=autospec, **kwargs))
mocked = f.mock
attach_as = kwargs.pop('attach_as', None)
@@ -218,7 +217,7 @@ class MockTestCase(TestCase):
else:
instance_mock = mock.Mock()
f = self.useFixture(mockpatch.PatchObject(module, name,
f = self.useFixture(fixtures.MockPatchObject(module, name,
autospec=autospec))
class_mock = f.mock
class_mock.return_value = instance_mock