Update Keystone code from official Github repository with branch Master on 09/01/2015.

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498

1 files changed, 3 insertions, 13 deletions

diff --git a/keystone-moon/keystone/tests/unit/test_hacking_checks.py b/keystone-moon/keystone/tests/unit/test_hacking_checks.py
index b9b047b3..962f5f8a 100644
--- a/keystone-moon/keystone/tests/unit/test_hacking_checks.py
+++ b/keystone-moon/keystone/tests/unit/test_hacking_checks.py
@@ -14,13 +14,13 @@ import textwrap
 
 import mock
 import pep8
-import testtools
 
-from keystone.hacking import checks
+from keystone.tests.hacking import checks
+from keystone.tests import unit
 from keystone.tests.unit.ksfixtures import hacking as hacking_fixtures
 
 
-class BaseStyleCheck(testtools.TestCase):
+class BaseStyleCheck(unit.BaseTestCase):
 
     def setUp(self):
         super(BaseStyleCheck, self).setUp()
@@ -122,16 +122,6 @@ class TestCheckForNonDebugLoggingIssues(BaseStyleCheck):
         self.assertEqual(expected_errors or [], actual_errors)
 
 
-class TestCheckOsloNamespaceImports(BaseStyleCheck):
-    def get_checker(self):
-        return checks.check_oslo_namespace_imports
-
-    def test(self):
-        code = self.code_ex.oslo_namespace_imports['code']
-        errors = self.code_ex.oslo_namespace_imports['expected_errors']
-        self.assert_has_errors(code, expected_errors=errors)
-
-
 class TestDictConstructorWithSequenceCopy(BaseStyleCheck):
 
     def get_checker(self):