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
This commit is contained in:
parent
0807dd2aba
commit
39345cc3c5
@ -57,7 +57,7 @@ from keystone.openstack.common.fixture import config as config_fixture
|
|||||||
from keystone.openstack.common.gettextutils import _
|
from keystone.openstack.common.gettextutils import _
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone import service
|
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
|
# NOTE(dstanek): Tests inheriting from TestCase depend on having the
|
||||||
# policy_file command-line option declared before setUp runs. Importing the
|
# policy_file command-line option declared before setUp runs. Importing the
|
||||||
|
@ -11,4 +11,4 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from keystone.tests.fixtures.cache import Cache # flake8: noqa
|
from keystone.tests.ksfixtures.cache import Cache # flake8: noqa
|
@ -16,7 +16,7 @@
|
|||||||
from keystone.common import environment
|
from keystone.common import environment
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests.fixtures import appserver
|
from keystone.tests.ksfixtures import appserver
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
@ -24,7 +24,7 @@ from keystone.openstack.common import jsonutils
|
|||||||
from keystone.openstack.common import timeutils
|
from keystone.openstack.common import timeutils
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests import default_fixtures
|
from keystone.tests import default_fixtures
|
||||||
from keystone.tests.fixtures import appserver
|
from keystone.tests.ksfixtures import appserver
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
@ -19,7 +19,7 @@ import ssl
|
|||||||
from keystone.common import environment
|
from keystone.common import environment
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests.fixtures import appserver
|
from keystone.tests.ksfixtures import appserver
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
Loading…
Reference in New Issue
Block a user