Merge "Rename keystone.tests.fixtures"

keystone/tests/core.py

@@ -57,7 +57,7 @@ from keystone.openstack.common.fixture import config as config_fixture
 from keystone.openstack.common.gettextutils import _
 from keystone.openstack.common import log
 from keystone import service
-from keystone.tests import fixtures as ksfixtures
+from keystone.tests import ksfixtures
 
 # NOTE(dstanek): Tests inheriting from TestCase depend on having the
 #   policy_file command-line option declared before setUp runs. Importing the

keystone/tests/ksfixtures/__init__.py

@@ -11,4 +11,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keystone.tests.fixtures.cache import Cache  # flake8: noqa
+from keystone.tests.ksfixtures.cache import Cache  # flake8: noqa

keystone/tests/test_ipv6.py

@@ -16,7 +16,7 @@
 from keystone.common import environment
 from keystone import config
 from keystone import tests
-from keystone.tests.fixtures import appserver
+from keystone.tests.ksfixtures import appserver
 
 
 CONF = config.CONF

keystone/tests/test_keystoneclient.py

@@ -24,7 +24,7 @@ from keystone.openstack.common import jsonutils
 from keystone.openstack.common import timeutils
 from keystone import tests
 from keystone.tests import default_fixtures
-from keystone.tests.fixtures import appserver
+from keystone.tests.ksfixtures import appserver
 
 
 CONF = config.CONF

keystone/tests/test_ssl.py

@@ -19,7 +19,7 @@ import ssl
 from keystone.common import environment
 from keystone import config
 from keystone import tests
-from keystone.tests.fixtures import appserver
+from keystone.tests.ksfixtures import appserver
 
 
 CONF = config.CONF