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
This commit is contained in:
committed by
Dolph Mathews
parent
a5f0e3c53c
commit
98c81b2a5b
@@ -14,6 +14,7 @@ import uuid
|
|||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
|
from oslo.config import fixture as config
|
||||||
import stevedore
|
import stevedore
|
||||||
|
|
||||||
from keystoneclient.auth import base
|
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 v2 as v2_auth
|
||||||
from keystoneclient.auth.identity import v3 as v3_auth
|
from keystoneclient.auth.identity import v3 as v3_auth
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.openstack.common.fixture import config
|
|
||||||
from keystoneclient.tests.auth import utils
|
from keystoneclient.tests.auth import utils
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import uuid
|
|||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
|
from oslo.config import fixture as config
|
||||||
import requests
|
import requests
|
||||||
import six
|
import six
|
||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
@@ -22,7 +23,6 @@ from testtools import matchers
|
|||||||
from keystoneclient import adapter
|
from keystoneclient import adapter
|
||||||
from keystoneclient.auth import base
|
from keystoneclient.auth import base
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.openstack.common.fixture import config
|
|
||||||
from keystoneclient.openstack.common import jsonutils
|
from keystoneclient.openstack.common import jsonutils
|
||||||
from keystoneclient import session as client_session
|
from keystoneclient import session as client_session
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests import utils
|
||||||
|
|||||||
@@ -13,11 +13,11 @@
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from lxml import etree
|
from lxml import etree
|
||||||
|
from oslo.config import fixture as config
|
||||||
|
|
||||||
from keystoneclient.auth import conf
|
from keystoneclient.auth import conf
|
||||||
from keystoneclient.contrib.auth.v3 import saml2
|
from keystoneclient.contrib.auth.v3 import saml2
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.openstack.common.fixture import config
|
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests.v3 import client_fixtures
|
from keystoneclient.tests.v3 import client_fixtures
|
||||||
from keystoneclient.tests.v3 import saml2_fixtures
|
from keystoneclient.tests.v3 import saml2_fixtures
|
||||||
|
|||||||
Reference in New Issue
Block a user