From 98c81b2a5b1903b3e734575736600ba053143a39 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Mon, 28 Jul 2014 16:41:00 -0500 Subject: [PATCH] Use config fixture from oslo.config With the release of oslo.config 1.4.0.0a1, oslo.config contains the config fixture. python-keystoneclient was using the config fixture in oslo-incubator's fixture module. With this change python-keystoneclient is using the config fixture in oslo.config Change-Id: Id03efdfbe8893c48a9ad65f0cf59e1dbae03dc47 --- keystoneclient/tests/auth/test_conf.py | 2 +- keystoneclient/tests/test_session.py | 2 +- keystoneclient/tests/v3/test_auth_saml2.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keystoneclient/tests/auth/test_conf.py b/keystoneclient/tests/auth/test_conf.py index 60828b885..24b20196f 100644 --- a/keystoneclient/tests/auth/test_conf.py +++ b/keystoneclient/tests/auth/test_conf.py @@ -14,6 +14,7 @@ import uuid import mock from oslo.config import cfg +from oslo.config import fixture as config import stevedore from keystoneclient.auth import base @@ -21,7 +22,6 @@ from keystoneclient.auth import conf from keystoneclient.auth.identity import v2 as v2_auth from keystoneclient.auth.identity import v3 as v3_auth from keystoneclient import exceptions -from keystoneclient.openstack.common.fixture import config from keystoneclient.tests.auth import utils diff --git a/keystoneclient/tests/test_session.py b/keystoneclient/tests/test_session.py index 20596e6d0..7d11d7055 100644 --- a/keystoneclient/tests/test_session.py +++ b/keystoneclient/tests/test_session.py @@ -15,6 +15,7 @@ import uuid import mock from oslo.config import cfg +from oslo.config import fixture as config import requests import six from testtools import matchers @@ -22,7 +23,6 @@ from testtools import matchers from keystoneclient import adapter from keystoneclient.auth import base from keystoneclient import exceptions -from keystoneclient.openstack.common.fixture import config from keystoneclient.openstack.common import jsonutils from keystoneclient import session as client_session from keystoneclient.tests import utils diff --git a/keystoneclient/tests/v3/test_auth_saml2.py b/keystoneclient/tests/v3/test_auth_saml2.py index 2003795c7..712c7f771 100644 --- a/keystoneclient/tests/v3/test_auth_saml2.py +++ b/keystoneclient/tests/v3/test_auth_saml2.py @@ -13,11 +13,11 @@ import uuid from lxml import etree +from oslo.config import fixture as config from keystoneclient.auth import conf from keystoneclient.contrib.auth.v3 import saml2 from keystoneclient import exceptions -from keystoneclient.openstack.common.fixture import config from keystoneclient import session from keystoneclient.tests.v3 import client_fixtures from keystoneclient.tests.v3 import saml2_fixtures