Launch integration tests with testr

A new paramter introduced to separate unit and inegration test launch.
Since nosetests is not used anymore, it was removed from requirements.

Readme for integration tests updated.

Change-Id: I6415e2885cae8571c0adb75216d9b11c7372462a
Fixes: bug #1259927
This commit is contained in:
Nikita Konovalov 2013-12-12 19:10:53 +04:00
parent 756d88ca07
commit ae8cba29c4
3 changed files with 4 additions and 29 deletions

View File

@ -45,17 +45,6 @@ all_files = 1
build-dir = doc/build
source-dir = doc/source
[nosetests]
cover-package=savanna
cover-html=true
cover-xml=true
cover-xml-file=coverage.xml
cover-erase=true
cover-inclusive=true
verbosity=3
detailed-errors=1
where=savanna/tests
[extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg

View File

@ -5,12 +5,11 @@ discover
docutils==0.9.1
fixtures>=0.3.14
mock>=1.0
nose
openstack.nose_plugin>=0.7
oslo.sphinx
pylint==0.25.2
sphinx>=1.1.2,<1.2
sphinxcontrib-httpdomain
testtools>=0.9.32
testrepository>=0.0.17
unittest2

19
tox.ini
View File

@ -8,13 +8,7 @@ usedevelop = True
install_command = pip install -U {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
NOSE_WITH_OPENSTACK=1
NOSE_OPENSTACK_COLOR=1
NOSE_OPENSTACK_RED=0.05
NOSE_OPENSTACK_YELLOW=0.025
NOSE_OPENSTACK_SHOW_ELAPSED=1
NOSE_OPENSTACK_STDOUT=1
NOSE_XUNIT=1
DISCOVER_DIRECTORY=savanna/tests/unit
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
@ -23,17 +17,10 @@ commands = python setup.py test --slowest --testr-args="{posargs}"
[testenv:integration]
setenv =
VIRTUAL_ENV={envdir}
NOSE_WITH_OPENSTACK=1
NOSE_OPENSTACK_COLOR=1
NOSE_OPENSTACK_RED=2500
NOSE_OPENSTACK_YELLOW=1500
NOSE_OPENSTACK_SHOW_ELAPSED=1
NOSE_OPENSTACK_STDOUT=1
NOSE_XUNIT=1
commands = nosetests -w integration -x {posargs}
DISCOVER_DIRECTORY=savanna/tests/integration
commands = python setup.py test --slowest --testr-args="{posargs}"
[testenv:cover]
VIRTUAL_ENV={envdir}
commands = python setup.py testr --coverage --testr-args='{posargs}'
[tox:jenkins]