diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-05-16 02:08:45 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-05-16 02:08:45 +0000 |
commit | 826e82b425a4a38e7a50317fb7f2bdd4c3a7e2ce (patch) | |
tree | 488ea36cc5def7caac31058c02ea01f0f9f64341 | |
parent | 7aa1912e43ddfcbe6e24f76be574981fb62445a5 (diff) | |
parent | dd2000b284dad0f19971bcf627410d37eea02409 (diff) | |
download | python-keystoneclient-826e82b425a4a38e7a50317fb7f2bdd4c3a7e2ce.tar.gz |
Merge "Stop using oslotest.mockpatch"
-rw-r--r-- | keystoneclient/tests/unit/test_base.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/keystoneclient/tests/unit/test_base.py b/keystoneclient/tests/unit/test_base.py index f6ca651..0a0fde1 100644 --- a/keystoneclient/tests/unit/test_base.py +++ b/keystoneclient/tests/unit/test_base.py @@ -11,9 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +import fixtures from keystoneauth1.identity import v2 from keystoneauth1 import session -from oslotest import mockpatch from keystoneclient import base from keystoneclient.tests.unit import utils @@ -44,7 +44,7 @@ class BaseTest(utils.TestCase): session_ = session.Session(auth=auth) self.client = client.Client(session=session_) - self.useFixture(mockpatch.PatchObject( + self.useFixture(fixtures.MockPatchObject( self.client._adapter, 'get', side_effect=AttributeError, autospec=True)) @@ -127,7 +127,7 @@ class ManagerTest(utils.TestCase): self.assertEqual(self.mgr.api, self.client) def test_get(self): - get_mock = self.useFixture(mockpatch.PatchObject( + get_mock = self.useFixture(fixtures.MockPatchObject( self.client, 'get', autospec=True, return_value=(None, self.body)) ).mock rsrc = self.mgr._get(self.url, "hello") @@ -135,7 +135,7 @@ class ManagerTest(utils.TestCase): self.assertEqual(rsrc.hi, 1) def test_post(self): - post_mock = self.useFixture(mockpatch.PatchObject( + post_mock = self.useFixture(fixtures.MockPatchObject( self.client, 'post', autospec=True, return_value=(None, self.body)) ).mock @@ -150,7 +150,7 @@ class ManagerTest(utils.TestCase): self.assertEqual(rsrc["hi"], 1) def test_put(self): - put_mock = self.useFixture(mockpatch.PatchObject( + put_mock = self.useFixture(fixtures.MockPatchObject( self.client, 'put', autospec=True, return_value=(None, self.body)) ).mock @@ -165,7 +165,7 @@ class ManagerTest(utils.TestCase): self.assertEqual(rsrc.hello["hi"], 1) def test_patch(self): - patch_mock = self.useFixture(mockpatch.PatchObject( + patch_mock = self.useFixture(fixtures.MockPatchObject( self.client, 'patch', autospec=True, return_value=(None, self.body)) ).mock @@ -181,12 +181,12 @@ class ManagerTest(utils.TestCase): self.assertEqual(rsrc.hello["hi"], 1) def test_update(self): - patch_mock = self.useFixture(mockpatch.PatchObject( + patch_mock = self.useFixture(fixtures.MockPatchObject( self.client, 'patch', autospec=True, return_value=(None, self.body)) ).mock - put_mock = self.useFixture(mockpatch.PatchObject( + put_mock = self.useFixture(fixtures.MockPatchObject( self.client, 'put', autospec=True, return_value=(None, self.body)) ).mock |