Move unit tests into tests.unit
keystonemiddleware should get functional testing eventually like the other keystone repos, so move the existing (unit) tests to keystonemiddelware.tests.unit. Change-Id: I7d5b1120fc5dc225fdd037b592a7914bde3f1ac2
This commit is contained in:
parent
06bdfc886f
commit
fec6f622f6
@ -47,8 +47,8 @@ from keystonemiddleware.auth_token import _base
|
|||||||
from keystonemiddleware.auth_token import _exceptions as exc
|
from keystonemiddleware.auth_token import _exceptions as exc
|
||||||
from keystonemiddleware.auth_token import _revocations
|
from keystonemiddleware.auth_token import _revocations
|
||||||
from keystonemiddleware.openstack.common import memorycache
|
from keystonemiddleware.openstack.common import memorycache
|
||||||
from keystonemiddleware.tests import client_fixtures
|
from keystonemiddleware.tests.unit import client_fixtures
|
||||||
from keystonemiddleware.tests import utils
|
from keystonemiddleware.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
EXPECTED_V2_DEFAULT_ENV_RESPONSE = {
|
EXPECTED_V2_DEFAULT_ENV_RESPONSE = {
|
@ -25,7 +25,7 @@ import testresources
|
|||||||
|
|
||||||
|
|
||||||
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')
|
@ -18,7 +18,7 @@ import testtools
|
|||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
from keystonemiddleware import _memcache_pool
|
from keystonemiddleware import _memcache_pool
|
||||||
from keystonemiddleware.tests import utils
|
from keystonemiddleware.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class _TestConnectionPool(_memcache_pool.ConnectionPool):
|
class _TestConnectionPool(_memcache_pool.ConnectionPool):
|
@ -16,7 +16,7 @@ import pkg_resources
|
|||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
from keystonemiddleware import opts
|
from keystonemiddleware import opts
|
||||||
from keystonemiddleware.tests import utils
|
from keystonemiddleware.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
class OptsTestCase(utils.TestCase):
|
class OptsTestCase(utils.TestCase):
|
@ -21,7 +21,7 @@ import testtools
|
|||||||
import webob
|
import webob
|
||||||
|
|
||||||
from keystonemiddleware import s3_token
|
from keystonemiddleware import s3_token
|
||||||
from keystonemiddleware.tests import utils
|
from keystonemiddleware.tests.unit import utils
|
||||||
|
|
||||||
|
|
||||||
GOOD_RESPONSE = {'access': {'token': {'id': 'TOKEN_ID',
|
GOOD_RESPONSE = {'access': {'token': {'id': 'TOKEN_ID',
|
Loading…
Reference in New Issue
Block a user