openstack/python-keystoneclient
Code Issues Proposed changes

Unmock requests when testing complete.

Browse Source 
Any other tests running will unexpectedly have mocks installed for
requests otherwise. Make the time mock behave the same way whilst there.

Change-Id: Iec4f35c51ed4650a35ae2780637192c82042a980
This commit is contained in:
Jamie Lennox
2013-06-20 16:44:28 +10:00
committed by Gerrit Code Review
parent 3056f33a1d
commit 4087747363
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/utils.py
View File

@@ -1,5 +1,6 @@
import time
import mock
import mox
import requests
import testtools
@@ -72,9 +73,12 @@ class TestCase(testtools.TestCase):
def setUp(self):
super(TestCase, self).setUp()
self.mox = mox.Mox()
self._original_time = time.time
time.time = lambda: 1234
requests.request = self.mox.CreateMockAnything()
self.request_patcher = mock.patch.object(requests, 'request',
self.mox.CreateMockAnything())
self.time_patcher = mock.patch.object(time, 'time',
lambda: 1234)
self.request_patcher.start()
self.time_patcher.start()
self.client = client.Client(username=self.TEST_USER,
token=self.TEST_TOKEN,
tenant_name=self.TEST_TENANT_NAME,
@@ -82,7 +86,8 @@ class TestCase(testtools.TestCase):
endpoint=self.TEST_URL)
def tearDown(self):
time.time = self._original_time
self.request_patcher.stop()
self.time_patcher.stop()
self.mox.UnsetStubs()
self.mox.VerifyAll()
super(TestCase, self).tearDown()
@@ -101,12 +106,16 @@ class UnauthenticatedTestCase(testtools.TestCase):
def setUp(self):
super(UnauthenticatedTestCase, self).setUp()
self.mox = mox.Mox()
self._original_time = time.time
time.time = lambda: 1234
requests.request = self.mox.CreateMockAnything()
self.request_patcher = mock.patch.object(requests, 'request',
self.mox.CreateMockAnything())
self.time_patcher = mock.patch.object(time, 'time',
lambda: 1234)
self.request_patcher.start()
self.time_patcher.start()
def tearDown(self):
time.time = self._original_time
self.request_patcher.stop()
self.time_patcher.stop()
self.mox.UnsetStubs()
self.mox.VerifyAll()
super(UnauthenticatedTestCase, self).tearDown()

25
tests/v3/utils.py
View File

@@ -4,6 +4,7 @@ import time
import urlparse
import uuid
import mock
import mox
import requests
import testtools
@@ -127,9 +128,12 @@ class TestCase(testtools.TestCase):
def setUp(self):
super(TestCase, self).setUp()
self.mox = mox.Mox()
self._original_time = time.time
time.time = lambda: 1234
requests.request = self.mox.CreateMockAnything()
self.request_patcher = mock.patch.object(requests, 'request',
self.mox.CreateMockAnything())
self.time_patcher = mock.patch.object(time, 'time',
lambda: 1234)
self.request_patcher.start()
self.time_patcher.start()
self.client = TestClient(username=self.TEST_USER,
token=self.TEST_TOKEN,
tenant_name=self.TEST_TENANT_NAME,
@@ -137,7 +141,8 @@ class TestCase(testtools.TestCase):
endpoint=self.TEST_URL)
def tearDown(self):
time.time = self._original_time
self.request_patcher.stop()
self.time_patcher.stop()
self.mox.UnsetStubs()
self.mox.VerifyAll()
super(TestCase, self).tearDown()
@@ -156,12 +161,16 @@ class UnauthenticatedTestCase(testtools.TestCase):
def setUp(self):
super(UnauthenticatedTestCase, self).setUp()
self.mox = mox.Mox()
self._original_time = time.time
time.time = lambda: 1234
requests.request = self.mox.CreateMockAnything()
self.request_patcher = mock.patch.object(requests, 'request',
self.mox.CreateMockAnything())
self.time_patcher = mock.patch.object(time, 'time',
lambda: 1234)
self.request_patcher.start()
def tearDown(self):
time.time = self._original_time
self.request_patcher.stop()
self.time_patcher.stop()
self.mox.UnsetStubs()
self.mox.VerifyAll()
super(UnauthenticatedTestCase, self).tearDown()