Merge "Remove mox dependency"

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):

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