From 7ed9834e10e87d58605a5fa09ce4670d913551d8 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Sun, 20 Aug 2017 08:44:19 +0200 Subject: No longer use oslotest.mockpatch It is deprecated[1] and will be removed soon. [1] I3efb3c64ebce396e756a47d110a74fe8604b6b72 Closes-Bug: #1712017 Change-Id: If6406da4c940686cbda696f760d06d45690912a1 --- heatclient/tests/unit/test_shell.py | 3 +-- test-requirements.txt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/heatclient/tests/unit/test_shell.py b/heatclient/tests/unit/test_shell.py index 57bd1ff..175eda1 100644 --- a/heatclient/tests/unit/test_shell.py +++ b/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): diff --git a/test-requirements.txt b/test-requirements.txt index a3f21c7..5c6d8d3 100644 --- a/test-requirements.txt +++ b/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 -- cgit v1.2.1