summaryrefslogtreecommitdiff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2012-12-24 23:36:10 -0600
committerMonty Taylor <mordred@inaugust.com>2012-12-25 00:04:42 -0600
commit55f2cdbe291542c7cb92f16d804957e1bd91be26 (patch)
tree072cede67adb1a187b8ce52a859c4333348d6ca8 /tests/utils.py
parentd37a3fb06cbb284d2bea330b456b774bfe2662f7 (diff)
downloadpython-keystoneclient-55f2cdbe291542c7cb92f16d804957e1bd91be26.tar.gz
Use testtools instead of unittest for base classes.
part of blueprint grizzle-testtools Change-Id: Ic9b438b4224d945e080d1d6071742ddc47ee81ed
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/utils.py b/tests/utils.py
index d4b44aa..6e8dbaf 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -2,12 +2,12 @@ import time
import mox
import requests
-import unittest2 as unittest
+import testtools
from keystoneclient.v2_0 import client
-class TestCase(unittest.TestCase):
+class TestCase(testtools.TestCase):
TEST_TENANT_ID = '1'
TEST_TENANT_NAME = 'aTenant'
TEST_TOKEN = 'aToken'
@@ -82,12 +82,12 @@ class TestCase(unittest.TestCase):
def tearDown(self):
time.time = self._original_time
- super(TestCase, self).tearDown()
self.mox.UnsetStubs()
self.mox.VerifyAll()
+ super(TestCase, self).tearDown()
-class UnauthenticatedTestCase(unittest.TestCase):
+class UnauthenticatedTestCase(testtools.TestCase):
""" Class used as base for unauthenticated calls """
TEST_ROOT_URL = 'http://127.0.0.1:5000/'
TEST_URL = '%s%s' % (TEST_ROOT_URL, 'v2.0')
@@ -107,9 +107,9 @@ class UnauthenticatedTestCase(unittest.TestCase):
def tearDown(self):
time.time = self._original_time
- super(UnauthenticatedTestCase, self).tearDown()
self.mox.UnsetStubs()
self.mox.VerifyAll()
+ super(UnauthenticatedTestCase, self).tearDown()
class TestResponse(requests.Response):