From 39345cc3c5282e1e19bfe5e51f0ffbf347b3fb37 Mon Sep 17 00:00:00 2001 From: Morgan Fainberg Date: Thu, 20 Mar 2014 00:24:48 -0700 Subject: [PATCH] Rename keystone.tests.fixtures Rename keystone.tests.fixtures to keystone.tests.ksfixtures. This differentiates our fixtures in imports from the global module fixtures and the oslo-incubator fixtures. Change-Id: Ida5c71644047a56b6a99da930ed7847a1603afd9 --- keystone/tests/core.py | 2 +- keystone/tests/{fixtures => ksfixtures}/__init__.py | 2 +- keystone/tests/{fixtures => ksfixtures}/appserver.py | 0 keystone/tests/{fixtures => ksfixtures}/cache.py | 0 keystone/tests/test_ipv6.py | 2 +- keystone/tests/test_keystoneclient.py | 2 +- keystone/tests/test_ssl.py | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename keystone/tests/{fixtures => ksfixtures}/__init__.py (89%) rename keystone/tests/{fixtures => ksfixtures}/appserver.py (100%) rename keystone/tests/{fixtures => ksfixtures}/cache.py (100%) diff --git a/keystone/tests/core.py b/keystone/tests/core.py index f651d5aaa..45b33a324 100644 --- a/keystone/tests/core.py +++ b/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 diff --git a/keystone/tests/fixtures/__init__.py b/keystone/tests/ksfixtures/__init__.py similarity index 89% rename from keystone/tests/fixtures/__init__.py rename to keystone/tests/ksfixtures/__init__.py index c58e3a5c7..4895af244 100644 --- a/keystone/tests/fixtures/__init__.py +++ b/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 diff --git a/keystone/tests/fixtures/appserver.py b/keystone/tests/ksfixtures/appserver.py similarity index 100% rename from keystone/tests/fixtures/appserver.py rename to keystone/tests/ksfixtures/appserver.py diff --git a/keystone/tests/fixtures/cache.py b/keystone/tests/ksfixtures/cache.py similarity index 100% rename from keystone/tests/fixtures/cache.py rename to keystone/tests/ksfixtures/cache.py diff --git a/keystone/tests/test_ipv6.py b/keystone/tests/test_ipv6.py index 02c5bea2d..832c6ee87 100644 --- a/keystone/tests/test_ipv6.py +++ b/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 diff --git a/keystone/tests/test_keystoneclient.py b/keystone/tests/test_keystoneclient.py index d0587f9b8..aaa5d9fc2 100644 --- a/keystone/tests/test_keystoneclient.py +++ b/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 diff --git a/keystone/tests/test_ssl.py b/keystone/tests/test_ssl.py index bd6c678e2..ecfdf3b8f 100644 --- a/keystone/tests/test_ssl.py +++ b/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