Restructure tests directory in preparation for cli integration tests
Partial-implements: blueprint cli-integration-tests Change-Id: I927c250d787414fb855df3c9952dff743ba11e24
This commit is contained in:
parent
a9dd45c7c1
commit
b9a6e8b27d
@ -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 saharaclient $LISTOPT $IDOPTION
|
${PYTHON:-python} -m subunit.run discover $DISCOVER_DIRECTORY $LISTOPT $IDOPTION
|
||||||
test_id_option=--load-list $IDFILE
|
test_id_option=--load-list $IDFILE
|
||||||
test_list_option=--list
|
test_list_option=--list
|
||||||
|
0
saharaclient/tests/integration/configs/__init__.py
Normal file
0
saharaclient/tests/integration/configs/__init__.py
Normal file
0
saharaclient/tests/integration/tests/__init__.py
Normal file
0
saharaclient/tests/integration/tests/__init__.py
Normal file
0
saharaclient/tests/unit/__init__.py
Normal file
0
saharaclient/tests/unit/__init__.py
Normal file
0
saharaclient/tests/unit/nova/__init__.py
Normal file
0
saharaclient/tests/unit/nova/__init__.py
Normal file
@ -25,7 +25,7 @@ from testtools import matchers
|
|||||||
import saharaclient.api.client
|
import saharaclient.api.client
|
||||||
from saharaclient.openstack.common.apiclient import exceptions
|
from saharaclient.openstack.common.apiclient import exceptions
|
||||||
import saharaclient.shell
|
import saharaclient.shell
|
||||||
from saharaclient.tests.nova import utils
|
from saharaclient.tests.unit.nova import utils
|
||||||
|
|
||||||
FAKE_ENV = {'OS_USERNAME': 'username',
|
FAKE_ENV = {'OS_USERNAME': 'username',
|
||||||
'OS_PASSWORD': 'password',
|
'OS_PASSWORD': 'password',
|
7
tox.ini
7
tox.ini
@ -9,11 +9,18 @@ install_command = pip install -U {opts} {packages}
|
|||||||
sitepackages = True
|
sitepackages = True
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
|
DISCOVER_DIRECTORY=saharaclient/tests/unit
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = python setup.py test --slowest --testr-args="{posargs}"
|
commands = python setup.py test --slowest --testr-args="{posargs}"
|
||||||
|
|
||||||
|
[testenv:integration]
|
||||||
|
setenv =
|
||||||
|
VIRTUAL_ENV={envdir}
|
||||||
|
DISCOVER_DIRECTORY=saharaclient/tests/integration/
|
||||||
|
commands = python setup.py test --slowest --testr-args="{posargs}"
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
commands = python setup.py test --coverage --testr-args='{posargs}'
|
commands = python setup.py test --coverage --testr-args='{posargs}'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user