openstack/castellan
Code Issues Proposed changes

Move unit tests to unit test folder

Browse Source 
Change-Id: Ife49e3b046a841a6fd8ac698b9d19c66850eedfd
This commit is contained in:
Kaitlin Farr 2015-07-22 14:28:27 -04:00
parent 4137e44e67
commit a6c9df4849
11 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.testr.conf
View File

@ -2,6 +2,6 @@
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./castellan/tests} $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE test_id_option=--load-list $IDFILE
test_list_option=--list test_list_option=--list

0
castellan/tests/key_manager/__init__.py → castellan/tests/unit/__init__.py
View File

0
castellan/tests/unit/key_manager/__init__.py Normal file
View File

2
castellan/tests/key_manager/fake.py → castellan/tests/unit/key_manager/fake.py
View File

@ -17,7 +17,7 @@
"""Implementation of a fake key manager.""" """Implementation of a fake key manager."""
from castellan.tests.key_manager import mock_key_manager from castellan.tests.unit.key_manager import mock_key_manager
def fake_api(): def fake_api():

0
castellan/tests/key_manager/mock_key_manager.py → castellan/tests/unit/key_manager/mock_key_manager.py
View File

2
castellan/tests/key_manager/test_barbican_key_manager.py → castellan/tests/unit/key_manager/test_barbican_key_manager.py
View File

@ -24,7 +24,7 @@ import mock
from castellan.common import exception from castellan.common import exception
from castellan.key_manager import barbican_key_manager from castellan.key_manager import barbican_key_manager
from castellan.key_manager import symmetric_key as key_manager_key from castellan.key_manager import symmetric_key as key_manager_key
from castellan.tests.key_manager import test_key_manager from castellan.tests.unit.key_manager import test_key_manager
class BarbicanKeyManagerTestCase(test_key_manager.KeyManagerTestCase): class BarbicanKeyManagerTestCase(test_key_manager.KeyManagerTestCase):

0
castellan/tests/key_manager/test_key.py → castellan/tests/unit/key_manager/test_key.py
View File

0
castellan/tests/key_manager/test_key_manager.py → castellan/tests/unit/key_manager/test_key_manager.py
View File

4
castellan/tests/key_manager/test_mock_key_manager.py → castellan/tests/unit/key_manager/test_mock_key_manager.py
View File

@ -24,8 +24,8 @@ from oslo_context import context
from castellan.common import exception from castellan.common import exception
from castellan.key_manager import symmetric_key as sym_key from castellan.key_manager import symmetric_key as sym_key
from castellan.tests.key_manager import mock_key_manager as mock_key_mgr from castellan.tests.unit.key_manager import mock_key_manager as mock_key_mgr
from castellan.tests.key_manager import test_key_manager as test_key_mgr from castellan.tests.unit.key_manager import test_key_manager as test_key_mgr
class MockKeyManagerTestCase(test_key_mgr.KeyManagerTestCase): class MockKeyManagerTestCase(test_key_mgr.KeyManagerTestCase):

2
castellan/tests/key_manager/test_not_implemented_key_manager.py → castellan/tests/unit/key_manager/test_not_implemented_key_manager.py
View File

@ -18,7 +18,7 @@ Test cases for the not implemented key manager.
""" """
from castellan.key_manager import not_implemented_key_manager from castellan.key_manager import not_implemented_key_manager
from castellan.tests.key_manager import test_key_manager from castellan.tests.unit.key_manager import test_key_manager
class NotImplementedKeyManagerTestCase(test_key_manager.KeyManagerTestCase): class NotImplementedKeyManagerTestCase(test_key_manager.KeyManagerTestCase):

1
tox.ini
View File

@ -8,6 +8,7 @@ usedevelop = True
install_command = pip install -U {opts} {packages} install_command = pip install -U {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
OS_TEST_PATH=./castellan/tests/unit
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}' commands = python setup.py testr --slowest --testr-args='{posargs}'