openstack/keystonemiddleware
Code Issues Proposed changes

Merge "Remove mox dependency"

Browse Source
This commit is contained in:
Jenkins 2014-07-29 05:07:38 +00:00 committed by Gerrit Code Review
commit 1f7b6467c7
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystonemiddleware/tests/utils.py
View File

@ -17,7 +17,6 @@ import time
import fixtures import fixtures
import httpretty import httpretty
import mock import mock
from mox3 import mox
import requests import requests
import six import six
from six.moves.urllib import parse as urlparse from six.moves.urllib import parse as urlparse
@ -43,15 +42,12 @@ class TestCase(testtools.TestCase):
def setUp(self): def setUp(self):
super(TestCase, self).setUp() super(TestCase, self).setUp()
self.mox = mox.Mox()
self.logger = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG)) self.logger = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG))
self.time_patcher = mock.patch.object(time, 'time', lambda: 1234) self.time_patcher = mock.patch.object(time, 'time', lambda: 1234)
self.time_patcher.start() self.time_patcher.start()
def tearDown(self): def tearDown(self):
self.time_patcher.stop() self.time_patcher.stop()
self.mox.UnsetStubs()
self.mox.VerifyAll()
super(TestCase, self).tearDown() super(TestCase, self).tearDown()
def stub_url(self, method, parts=None, base_url=None, json=None, **kwargs): def stub_url(self, method, parts=None, base_url=None, json=None, **kwargs):

1
test-requirements.txt
View File

@ -4,7 +4,6 @@ fixtures>=0.3.14
hacking>=0.8.0,<0.9 hacking>=0.8.0,<0.9
httpretty>=0.8.0,!=0.8.1,!=0.8.2 httpretty>=0.8.0,!=0.8.1,!=0.8.2
mock>=1.0 mock>=1.0
mox3>=0.7.0
pycrypto>=2.6 pycrypto>=2.6
sphinx>=1.1.2,!=1.2.0,<1.3 sphinx>=1.1.2,!=1.2.0,<1.3
testrepository>=0.0.18 testrepository>=0.0.18