Adds test directory for new architecture

This patch enables tox to test both old architecture and new
architecture. If you'd like to test with new architecture, execute
following command.

 $ tox -enew_arch

Change-Id: I28a137b73fcd8f56ecdeedfc20274f7b37bab620
This commit is contained in:
Masahito Muroi 2016-01-28 17:01:22 -08:00
parent f2cb179c4e
commit dfd4c1b29e
6 changed files with 34 additions and 1 deletions

7
.testr.conf.new Normal file
View File

@ -0,0 +1,7 @@
[DEFAULT]
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
${PYTHON:-python} -m subunit.run discover -t ./ ./congress/tests2 $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE
test_list_option=--list

View File

View File

8
tools/check_dot_testr_conf.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/sh
target=$1
if [ -e '.testr.conf' ] ; then
rm .testr.conf
fi
ln -s $target .testr.conf

20
tox.ini
View File

@ -1,7 +1,7 @@
[tox]
minversion = 1.6
skipsdist = True
envlist = py34,py27,pep8
envlist = py34,py27,pep8,new_arch
[testenv]
usedevelop = True
@ -16,6 +16,24 @@ setenv =
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
{toxinidir}/tools/check_dot_testr_conf.sh .testr.conf.old
find . -type f -name "*.pyc" -delete
python setup.py testr --slowest --testr-args='{posargs}'
[testenv:new_arch]
usedevelop = True
install_command = pip install -U {opts} {packages}
whitelist_externals = find
setenv =
VIRTUAL_ENV={envdir}
LANG=en_US.UTF-8
LANGUAGE=en_US
LC_ALL=en_US.utf-8
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
{toxinidir}/tools/check_dot_testr_conf.sh .testr.conf.new
find . -type f -name "*.pyc" -delete
python setup.py testr --slowest --testr-args='{posargs}'