Merge "No longer use oslotest.mockpatch"

heatclient/tests/unit/test_shell.py

@@ -22,7 +22,6 @@ import mock
 import mox
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
-from oslotest import mockpatch
 import requests
 from requests_mock.contrib import fixture as rm_fixture
 import six
@@ -124,7 +123,7 @@ class TestCase(testtools.TestCase):
     # NOTE(tlashchova): this overrides the testtools.TestCase.patch method
     # that does simple monkey-patching in favor of mock's patching
     def patch(self, target, **kwargs):
-        mockfixture = self.useFixture(mockpatch.Patch(target, **kwargs))
+        mockfixture = self.useFixture(fixtures.MockPatch(target, **kwargs))
         return mockfixture.mock
 
     def stack_list_resp_dict(self, show_nested=False, include_project=False):

test-requirements.txt

@@ -10,7 +10,6 @@ requests-mock>=1.1.0 # Apache-2.0
 mock>=2.0.0 # BSD
 mox3>=0.20.0 # Apache-2.0
 openstackdocstheme>=1.17.0 # Apache-2.0
-oslotest>=1.10.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0
 sphinx>=1.6.2 # BSD
 tempest>=16.1.0 # Apache-2.0