Merge "Make functional tests out of Jenkin's verification"

.testr.conf

@@ -2,7 +2,6 @@
 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 ./ ${OS_TEST_PATH:-./valence/tests} $LISTOPT $IDOPTION
-             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./valence/tests/functional} $LISTOPT $IDOPTION
+             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./valence/tests/unit} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list

tox.ini

@@ -10,7 +10,8 @@ install_command =
                   pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:common-constraints]
@@ -23,6 +24,10 @@ commands = flake8 {posargs}
 install_command = {[testenv:common-constraints]install_command}
 commands = flake8 {posargs}
 
+[testenv:functional]
+setenv = OS_TEST_PATH=./valence/tests/functional
+deps = {[testenv]deps}
+
 [testenv:venv]
 commands = {posargs}