aboutsummaryrefslogtreecommitdiffstats
path: root/keystone-moon/keystone/tests/unit/common/test_utils.py
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2015-09-24 16:27:16 +0200
committerasteroide <thomas.duval@orange.com>2015-09-24 16:27:16 +0200
commit92d11d139e9f76d4fd76859aea78643fc32ef36b (patch)
treebd5a2e7b50853498074ab55bdaee4452c460010b /keystone-moon/keystone/tests/unit/common/test_utils.py
parent49325d99acfadaadfad99c596c4ada6b5ec849de (diff)
Update Keystone code from repository.
Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00
Diffstat (limited to 'keystone-moon/keystone/tests/unit/common/test_utils.py')
-rw-r--r--keystone-moon/keystone/tests/unit/common/test_utils.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/keystone-moon/keystone/tests/unit/common/test_utils.py b/keystone-moon/keystone/tests/unit/common/test_utils.py
index e8bac3c0..d52eb729 100644
--- a/keystone-moon/keystone/tests/unit/common/test_utils.py
+++ b/keystone-moon/keystone/tests/unit/common/test_utils.py
@@ -20,7 +20,7 @@ from oslo_serialization import jsonutils
from keystone.common import utils as common_utils
from keystone import exception
from keystone import service
-from keystone.tests import unit as tests
+from keystone.tests import unit
from keystone.tests.unit import utils
@@ -29,7 +29,7 @@ CONF = cfg.CONF
TZ = utils.TZ
-class UtilsTestCase(tests.BaseTestCase):
+class UtilsTestCase(unit.BaseTestCase):
OPTIONAL = object()
def setUp(self):
@@ -154,11 +154,11 @@ class UtilsTestCase(tests.BaseTestCase):
self.assertEqual(expected_json, json)
-class ServiceHelperTests(tests.BaseTestCase):
+class ServiceHelperTests(unit.BaseTestCase):
@service.fail_gracefully
def _do_test(self):
raise Exception("Test Exc")
def test_fail_gracefully(self):
- self.assertRaises(tests.UnexpectedExit, self._do_test)
+ self.assertRaises(unit.UnexpectedExit, self._do_test)