From 823bbdcf74d0d7c479ce706a44341f04841e52cf Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Mon, 28 Jul 2014 10:37:13 +1000 Subject: [PATCH] Remove mox dependency This seems to have been inherited rather than ever actually used. We should only be using mock for testing. Change-Id: Ib37bf796560138077c96458dbcd9886dcacebd2e --- keystonemiddleware/tests/utils.py | 4 ---- test-requirements.txt | 1 - 2 files changed, 5 deletions(-) diff --git a/keystonemiddleware/tests/utils.py b/keystonemiddleware/tests/utils.py index 2bdb6d39..a862b007 100644 --- a/keystonemiddleware/tests/utils.py +++ b/keystonemiddleware/tests/utils.py @@ -17,7 +17,6 @@ import time import fixtures import httpretty import mock -from mox3 import mox import requests import six from six.moves.urllib import parse as urlparse @@ -43,15 +42,12 @@ class TestCase(testtools.TestCase): def setUp(self): super(TestCase, self).setUp() - self.mox = mox.Mox() self.logger = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG)) self.time_patcher = mock.patch.object(time, 'time', lambda: 1234) self.time_patcher.start() def tearDown(self): self.time_patcher.stop() - self.mox.UnsetStubs() - self.mox.VerifyAll() super(TestCase, self).tearDown() def stub_url(self, method, parts=None, base_url=None, json=None, **kwargs): diff --git a/test-requirements.txt b/test-requirements.txt index f6a6cf90..eacb6b3a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,6 @@ fixtures>=0.3.14 hacking>=0.8.0,<0.9 httpretty>=0.8.0,!=0.8.1,!=0.8.2 mock>=1.0 -mox3>=0.7.0 pycrypto>=2.6 sphinx>=1.1.2,!=1.2.0,<1.3 testrepository>=0.0.18