Merge "Move tests to the unit subdirectory"
This commit is contained in:
@@ -16,7 +16,7 @@
|
|||||||
import six
|
import six
|
||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class FakeResponse(object):
|
class FakeResponse(object):
|
@@ -17,7 +17,7 @@ from keystoneclient import auth
|
|||||||
from keystoneclient.auth.identity import access as access_plugin
|
from keystoneclient.auth.identity import access as access_plugin
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class AccessInfoPluginTests(utils.TestCase):
|
class AccessInfoPluginTests(utils.TestCase):
|
@@ -19,7 +19,7 @@ from oslo_config import cfg
|
|||||||
|
|
||||||
from keystoneclient.auth import base
|
from keystoneclient.auth import base
|
||||||
from keystoneclient.auth import cli
|
from keystoneclient.auth import cli
|
||||||
from keystoneclient.tests.auth import utils
|
from keystoneclient.tests.unit.auth import utils
|
||||||
|
|
||||||
|
|
||||||
class TesterPlugin(base.BaseAuthPlugin):
|
class TesterPlugin(base.BaseAuthPlugin):
|
@@ -22,7 +22,7 @@ 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.tests.auth import utils
|
from keystoneclient.tests.unit.auth import utils
|
||||||
|
|
||||||
|
|
||||||
class ConfTests(utils.TestCase):
|
class ConfTests(utils.TestCase):
|
@@ -22,7 +22,7 @@ from keystoneclient.auth import base
|
|||||||
from keystoneclient.auth import identity
|
from keystoneclient.auth import identity
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
@six.add_metaclass(abc.ABCMeta)
|
@six.add_metaclass(abc.ABCMeta)
|
@@ -16,7 +16,7 @@ import uuid
|
|||||||
from keystoneclient.auth.identity import v2
|
from keystoneclient.auth.identity import v2
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class V2IdentityPlugin(utils.TestCase):
|
class V2IdentityPlugin(utils.TestCase):
|
@@ -19,7 +19,7 @@ from keystoneclient import client
|
|||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class V3IdentityPlugin(utils.TestCase):
|
class V3IdentityPlugin(utils.TestCase):
|
@@ -15,7 +15,7 @@ import uuid
|
|||||||
from keystoneclient.auth.identity.generic import password
|
from keystoneclient.auth.identity.generic import password
|
||||||
from keystoneclient.auth.identity import v2
|
from keystoneclient.auth.identity import v2
|
||||||
from keystoneclient.auth.identity import v3
|
from keystoneclient.auth.identity import v3
|
||||||
from keystoneclient.tests.auth import utils
|
from keystoneclient.tests.unit.auth import utils
|
||||||
|
|
||||||
|
|
||||||
class PasswordTests(utils.GenericPluginTestCase):
|
class PasswordTests(utils.GenericPluginTestCase):
|
@@ -15,7 +15,7 @@ import uuid
|
|||||||
from keystoneclient.auth.identity.generic import token
|
from keystoneclient.auth.identity.generic import token
|
||||||
from keystoneclient.auth.identity import v2
|
from keystoneclient.auth.identity import v2
|
||||||
from keystoneclient.auth.identity import v3
|
from keystoneclient.auth.identity import v3
|
||||||
from keystoneclient.tests.auth import utils
|
from keystoneclient.tests.unit.auth import utils
|
||||||
|
|
||||||
|
|
||||||
class TokenTests(utils.GenericPluginTestCase):
|
class TokenTests(utils.GenericPluginTestCase):
|
@@ -14,7 +14,7 @@ from testtools import matchers
|
|||||||
|
|
||||||
from keystoneclient.auth import token_endpoint
|
from keystoneclient.auth import token_endpoint
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class TokenEndpointTest(utils.TestCase):
|
class TokenEndpointTest(utils.TestCase):
|
@@ -22,7 +22,7 @@ from keystoneclient.auth import base
|
|||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class MockPlugin(base.BaseAuthPlugin):
|
class MockPlugin(base.BaseAuthPlugin):
|
@@ -25,7 +25,7 @@ from keystoneclient import utils
|
|||||||
|
|
||||||
|
|
||||||
TESTDIR = os.path.dirname(os.path.abspath(__file__))
|
TESTDIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
ROOTDIR = os.path.normpath(os.path.join(TESTDIR, '..', '..'))
|
ROOTDIR = os.path.normpath(os.path.join(TESTDIR, '..', '..', '..'))
|
||||||
CERTDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'certs')
|
CERTDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'certs')
|
||||||
CMSDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'cms')
|
CMSDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'cms')
|
||||||
KEYDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'private')
|
KEYDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'private')
|
@@ -16,7 +16,7 @@
|
|||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from keystoneclient.generic import client
|
from keystoneclient.generic import client
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
BASE_HOST = 'http://keystone.example.com'
|
BASE_HOST = 'http://keystone.example.com'
|
||||||
BASE_URL = "%s:5000/" % BASE_HOST
|
BASE_URL = "%s:5000/" % BASE_HOST
|
@@ -17,7 +17,7 @@ import mock
|
|||||||
from six import moves
|
from six import moves
|
||||||
|
|
||||||
from keystoneclient.generic import shell
|
from keystoneclient.generic import shell
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class DoDiscoverTest(utils.TestCase):
|
class DoDiscoverTest(utils.TestCase):
|
@@ -41,8 +41,8 @@ from keystoneclient import exceptions
|
|||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient.middleware import auth_token
|
from keystoneclient.middleware import auth_token
|
||||||
from keystoneclient.openstack.common import memorycache
|
from keystoneclient.openstack.common import memorycache
|
||||||
from keystoneclient.tests import client_fixtures
|
from keystoneclient.tests.unit import client_fixtures
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
EXPECTED_V2_DEFAULT_ENV_RESPONSE = {
|
EXPECTED_V2_DEFAULT_ENV_RESPONSE = {
|
@@ -11,7 +11,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from keystoneclient import base
|
from keystoneclient import base
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
from keystoneclient.v2_0 import client
|
from keystoneclient.v2_0 import client
|
||||||
from keystoneclient.v2_0 import roles
|
from keystoneclient.v2_0 import roles
|
||||||
|
|
@@ -20,8 +20,8 @@ from testtools import matchers
|
|||||||
|
|
||||||
from keystoneclient.common import cms
|
from keystoneclient.common import cms
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests import client_fixtures
|
from keystoneclient.tests.unit import client_fixtures
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class CMSTest(utils.TestCase, testresources.ResourcedTestCase):
|
class CMSTest(utils.TestCase, testresources.ResourcedTestCase):
|
@@ -24,7 +24,7 @@ from keystoneclient import discover
|
|||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
from keystoneclient.v2_0 import client as v2_client
|
from keystoneclient.v2_0 import client as v2_client
|
||||||
from keystoneclient.v3 import client as v3_client
|
from keystoneclient.v3 import client as v3_client
|
||||||
|
|
@@ -15,7 +15,7 @@ import uuid
|
|||||||
import six
|
import six
|
||||||
|
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class V2TokenTests(utils.TestCase):
|
class V2TokenTests(utils.TestCase):
|
@@ -17,7 +17,7 @@ import pep8
|
|||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
from keystoneclient.hacking import checks
|
from keystoneclient.hacking import checks
|
||||||
from keystoneclient.tests import client_fixtures
|
from keystoneclient.tests.unit import client_fixtures
|
||||||
|
|
||||||
|
|
||||||
class TestCheckOsloNamespaceImports(testtools.TestCase):
|
class TestCheckOsloNamespaceImports(testtools.TestCase):
|
@@ -20,7 +20,7 @@ from testtools import matchers
|
|||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import httpclient
|
from keystoneclient import httpclient
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
RESPONSE_BODY = '{"hi": "there"}'
|
RESPONSE_BODY = '{"hi": "there"}'
|
@@ -14,7 +14,7 @@ import mock
|
|||||||
import requests
|
import requests
|
||||||
|
|
||||||
from keystoneclient import httpclient
|
from keystoneclient import httpclient
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
FAKE_RESPONSE = utils.TestResponse({
|
FAKE_RESPONSE = utils.TestResponse({
|
@@ -17,8 +17,8 @@ from oslo_utils import timeutils
|
|||||||
|
|
||||||
from keystoneclient import access
|
from keystoneclient import access
|
||||||
from keystoneclient import httpclient
|
from keystoneclient import httpclient
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
from keystoneclient.tests.v2_0 import client_fixtures
|
from keystoneclient.tests.unit.v2_0 import client_fixtures
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import keyring # noqa
|
import keyring # noqa
|
@@ -20,7 +20,7 @@ import testtools
|
|||||||
import webob
|
import webob
|
||||||
|
|
||||||
from keystoneclient.middleware import s3_token
|
from keystoneclient.middleware import s3_token
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
GOOD_RESPONSE = {'access': {'token': {'id': 'TOKEN_ID',
|
GOOD_RESPONSE = {'access': {'token': {'id': 'TOKEN_ID',
|
@@ -26,7 +26,7 @@ from keystoneclient import adapter
|
|||||||
from keystoneclient.auth import base
|
from keystoneclient.auth import base
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import session as client_session
|
from keystoneclient import session as client_session
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class SessionTests(utils.TestCase):
|
class SessionTests(utils.TestCase):
|
@@ -26,7 +26,7 @@ from testtools import matchers
|
|||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient import shell as openstack_shell
|
from keystoneclient import shell as openstack_shell
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
from keystoneclient.v2_0 import shell as shell_v2_0
|
from keystoneclient.v2_0 import shell as shell_v2_0
|
||||||
|
|
||||||
|
|
@@ -18,8 +18,8 @@ import testresources
|
|||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests import client_fixtures
|
from keystoneclient.tests.unit import client_fixtures
|
||||||
from keystoneclient.tests import utils as test_utils
|
from keystoneclient.tests.unit import utils as test_utils
|
||||||
from keystoneclient import utils
|
from keystoneclient import utils
|
||||||
|
|
||||||
|
|
@@ -18,9 +18,9 @@ import testresources
|
|||||||
|
|
||||||
from keystoneclient import access
|
from keystoneclient import access
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient.tests import client_fixtures as token_data
|
from keystoneclient.tests.unit import client_fixtures as token_data
|
||||||
from keystoneclient.tests.v2_0 import client_fixtures
|
from keystoneclient.tests.unit.v2_0 import client_fixtures
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
|
|
||||||
|
|
||||||
class AccessInfoTest(utils.TestCase, testresources.ResourcedTestCase):
|
class AccessInfoTest(utils.TestCase, testresources.ResourcedTestCase):
|
@@ -17,7 +17,7 @@ from oslo_serialization import jsonutils
|
|||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
from keystoneclient.v2_0 import client
|
from keystoneclient.v2_0 import client
|
||||||
|
|
||||||
|
|
@@ -13,8 +13,8 @@
|
|||||||
|
|
||||||
import testresources
|
import testresources
|
||||||
|
|
||||||
from keystoneclient.tests import client_fixtures
|
from keystoneclient.tests.unit import client_fixtures
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
|
|
||||||
|
|
||||||
class CertificateTests(utils.TestCase, testresources.ResourcedTestCase):
|
class CertificateTests(utils.TestCase, testresources.ResourcedTestCase):
|
@@ -19,8 +19,8 @@ from keystoneclient.auth import token_endpoint
|
|||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests.v2_0 import client_fixtures
|
from keystoneclient.tests.unit.v2_0 import client_fixtures
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
from keystoneclient.v2_0 import client
|
from keystoneclient.v2_0 import client
|
||||||
|
|
||||||
|
|
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
|
|
||||||
from keystoneclient.generic import client
|
from keystoneclient.generic import client
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
|
|
||||||
|
|
||||||
class DiscoverKeystoneTests(utils.UnauthenticatedTestCase):
|
class DiscoverKeystoneTests(utils.UnauthenticatedTestCase):
|
@@ -10,7 +10,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
from keystoneclient.v2_0 import ec2
|
from keystoneclient.v2_0 import ec2
|
||||||
|
|
||||||
|
|
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
from keystoneclient.v2_0 import endpoints
|
from keystoneclient.v2_0 import endpoints
|
||||||
|
|
||||||
|
|
@@ -10,7 +10,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
from keystoneclient.v2_0 import extensions
|
from keystoneclient.v2_0 import extensions
|
||||||
|
|
||||||
|
|
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
from keystoneclient.v2_0 import roles
|
from keystoneclient.v2_0 import roles
|
||||||
|
|
||||||
|
|
@@ -12,8 +12,8 @@
|
|||||||
|
|
||||||
from keystoneclient import access
|
from keystoneclient import access
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests.v2_0 import client_fixtures
|
from keystoneclient.tests.unit.v2_0 import client_fixtures
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
|
|
||||||
|
|
||||||
class ServiceCatalogTest(utils.TestCase):
|
class ServiceCatalogTest(utils.TestCase):
|
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
from keystoneclient.v2_0 import services
|
from keystoneclient.v2_0 import services
|
||||||
|
|
||||||
|
|
@@ -19,7 +19,7 @@ import six
|
|||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_USERNAME = 'username'
|
DEFAULT_USERNAME = 'username'
|
@@ -14,7 +14,7 @@ import uuid
|
|||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
from keystoneclient.v2_0 import client
|
from keystoneclient.v2_0 import client
|
||||||
from keystoneclient.v2_0 import tenants
|
from keystoneclient.v2_0 import tenants
|
||||||
from keystoneclient.v2_0 import users
|
from keystoneclient.v2_0 import users
|
@@ -15,7 +15,7 @@ import uuid
|
|||||||
from keystoneclient import access
|
from keystoneclient import access
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
from keystoneclient.v2_0 import client
|
from keystoneclient.v2_0 import client
|
||||||
from keystoneclient.v2_0 import tokens
|
from keystoneclient.v2_0 import tokens
|
||||||
|
|
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v2_0 import utils
|
from keystoneclient.tests.unit.v2_0 import utils
|
||||||
from keystoneclient.v2_0 import roles
|
from keystoneclient.v2_0 import roles
|
||||||
from keystoneclient.v2_0 import users
|
from keystoneclient.v2_0 import users
|
||||||
|
|
@@ -10,7 +10,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
from keystoneclient.v2_0 import client
|
from keystoneclient.v2_0 import client
|
||||||
|
|
||||||
TestResponse = utils.TestResponse
|
TestResponse = utils.TestResponse
|
0
keystoneclient/tests/unit/v3/__init__.py
Normal file
0
keystoneclient/tests/unit/v3/__init__.py
Normal file
@@ -17,8 +17,8 @@ from oslo_utils import timeutils
|
|||||||
|
|
||||||
from keystoneclient import access
|
from keystoneclient import access
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient.tests.v3 import client_fixtures
|
from keystoneclient.tests.unit.v3 import client_fixtures
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
|
|
||||||
|
|
||||||
TOKEN_RESPONSE = utils.TestResponse({
|
TOKEN_RESPONSE = utils.TestResponse({
|
@@ -13,7 +13,7 @@
|
|||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import client
|
from keystoneclient.v3 import client
|
||||||
|
|
||||||
|
|
@@ -22,9 +22,9 @@ 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 import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests.v3 import client_fixtures
|
from keystoneclient.tests.unit.v3 import client_fixtures
|
||||||
from keystoneclient.tests.v3 import saml2_fixtures
|
from keystoneclient.tests.unit.v3 import saml2_fixtures
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
|
|
||||||
ROOTDIR = os.path.dirname(os.path.abspath(__file__))
|
ROOTDIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
XMLDIR = os.path.join(ROOTDIR, 'examples', 'xml/')
|
XMLDIR = os.path.join(ROOTDIR, 'examples', 'xml/')
|
@@ -19,8 +19,8 @@ import six
|
|||||||
from keystoneclient.auth import token_endpoint
|
from keystoneclient.auth import token_endpoint
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests.v3 import client_fixtures
|
from keystoneclient.tests.unit.v3 import client_fixtures
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import client
|
from keystoneclient.v3 import client
|
||||||
|
|
||||||
|
|
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import credentials
|
from keystoneclient.v3 import credentials
|
||||||
|
|
||||||
|
|
@@ -11,7 +11,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from keystoneclient.generic import client
|
from keystoneclient.generic import client
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
|
|
||||||
|
|
||||||
class DiscoverKeystoneTests(utils.UnauthenticatedTestCase):
|
class DiscoverKeystoneTests(utils.UnauthenticatedTestCase):
|
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import domains
|
from keystoneclient.v3 import domains
|
||||||
|
|
||||||
|
|
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
|
|
||||||
|
|
||||||
class EndpointTestUtils(object):
|
class EndpointTestUtils(object):
|
@@ -14,8 +14,8 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v3 import test_endpoint_filter
|
from keystoneclient.tests.unit.v3 import test_endpoint_filter
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
|
|
||||||
|
|
||||||
class EndpointPolicyTests(utils.TestCase,
|
class EndpointPolicyTests(utils.TestCase,
|
@@ -13,7 +13,7 @@
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import endpoints
|
from keystoneclient.v3 import endpoints
|
||||||
|
|
||||||
|
|
@@ -16,7 +16,7 @@ import uuid
|
|||||||
from keystoneclient import access
|
from keystoneclient import access
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient import fixture
|
from keystoneclient import fixture
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3.contrib.federation import base
|
from keystoneclient.v3.contrib.federation import base
|
||||||
from keystoneclient.v3.contrib.federation import identity_providers
|
from keystoneclient.v3.contrib.federation import identity_providers
|
||||||
from keystoneclient.v3.contrib.federation import mappings
|
from keystoneclient.v3.contrib.federation import mappings
|
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import groups
|
from keystoneclient.v3 import groups
|
||||||
|
|
||||||
|
|
@@ -20,8 +20,8 @@ from six.moves.urllib import parse as urlparse
|
|||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from keystoneclient.tests.v3 import client_fixtures
|
from keystoneclient.tests.unit.v3 import client_fixtures
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3.contrib.oauth1 import access_tokens
|
from keystoneclient.v3.contrib.oauth1 import access_tokens
|
||||||
from keystoneclient.v3.contrib.oauth1 import auth
|
from keystoneclient.v3.contrib.oauth1 import auth
|
||||||
from keystoneclient.v3.contrib.oauth1 import consumers
|
from keystoneclient.v3.contrib.oauth1 import consumers
|
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import policies
|
from keystoneclient.v3 import policies
|
||||||
|
|
||||||
|
|
@@ -13,7 +13,7 @@
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import projects
|
from keystoneclient.v3 import projects
|
||||||
|
|
||||||
|
|
@@ -14,7 +14,7 @@
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import regions
|
from keystoneclient.v3 import regions
|
||||||
|
|
||||||
|
|
@@ -11,7 +11,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import role_assignments
|
from keystoneclient.v3 import role_assignments
|
||||||
|
|
||||||
|
|
@@ -15,7 +15,7 @@
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import roles
|
from keystoneclient.v3 import roles
|
||||||
|
|
||||||
|
|
@@ -12,8 +12,8 @@
|
|||||||
|
|
||||||
from keystoneclient import access
|
from keystoneclient import access
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests.v3 import client_fixtures
|
from keystoneclient.tests.unit.v3 import client_fixtures
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
|
|
||||||
|
|
||||||
class ServiceCatalogTest(utils.TestCase):
|
class ServiceCatalogTest(utils.TestCase):
|
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import services
|
from keystoneclient.v3 import services
|
||||||
|
|
||||||
|
|
@@ -16,8 +16,8 @@ import testresources
|
|||||||
|
|
||||||
from keystoneclient import access
|
from keystoneclient import access
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests import client_fixtures
|
from keystoneclient.tests.unit import client_fixtures
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
|
|
||||||
|
|
||||||
class TokenTests(utils.TestCase, testresources.ResourcedTestCase):
|
class TokenTests(utils.TestCase, testresources.ResourcedTestCase):
|
@@ -16,7 +16,7 @@ import uuid
|
|||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3.contrib import trusts
|
from keystoneclient.v3.contrib import trusts
|
||||||
|
|
||||||
|
|
@@ -15,7 +15,7 @@
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient import exceptions
|
from keystoneclient import exceptions
|
||||||
from keystoneclient.tests.v3 import utils
|
from keystoneclient.tests.unit.v3 import utils
|
||||||
from keystoneclient.v3 import users
|
from keystoneclient.v3 import users
|
||||||
|
|
||||||
|
|
@@ -15,7 +15,7 @@ import uuid
|
|||||||
import six
|
import six
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
|
|
||||||
from keystoneclient.tests import utils
|
from keystoneclient.tests.unit import utils
|
||||||
from keystoneclient.v3 import client
|
from keystoneclient.v3 import client
|
||||||
|
|
||||||
|
|
Reference in New Issue
Block a user