diff --git a/.testr.conf.old b/.testr.conf similarity index 100% rename from .testr.conf.old rename to .testr.conf diff --git a/.testr.conf.new b/.testr.conf.new deleted file mode 100644 index 0f728c39e..000000000 --- a/.testr.conf.new +++ /dev/null @@ -1,7 +0,0 @@ -[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 diff --git a/tools/check_dot_testr_conf.sh b/tools/check_dot_testr_conf.sh deleted file mode 100755 index 3e4ed0f8e..000000000 --- a/tools/check_dot_testr_conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -target=$1 - -if [ -e '.testr.conf' ] ; then - rm .testr.conf -fi -ln -s $target .testr.conf \ No newline at end of file diff --git a/tox.ini b/tox.ini index ed6994d21..360897354 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 1.6 skipsdist = True -envlist = py35,py34,py27,pep8,new_arch +envlist = py35,py34,py27,pep8 [testenv] usedevelop = True @@ -15,25 +15,7 @@ setenv = 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.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 +commands = find . -type f -name "*.pyc" -delete python setup.py testr --slowest --testr-args='{posargs}'