Merge "Don't run unit tests from run_functests.sh" into feature/v2
This commit is contained in:
commit
03d1af7380
@ -5,11 +5,6 @@ set -o pipefail
|
||||
|
||||
BASE_DIR=$(cd $(dirname "$0")/.. && pwd)
|
||||
|
||||
# first we will run python functional tests with tox
|
||||
pushd $BASE_DIR
|
||||
tox -epython-functests
|
||||
popd
|
||||
|
||||
# then execute tests for elements
|
||||
export DIB_CMD=disk-image-create
|
||||
export DIB_ELEMENTS=$(python -c '
|
||||
|
3
tox.ini
3
tox.ini
@ -24,9 +24,6 @@ commands = {posargs}
|
||||
envdir = {toxworkdir}/venv
|
||||
commands = {toxinidir}/tests/run_functests.sh {posargs}
|
||||
|
||||
[testenv:python-functests]
|
||||
setenv = OS_TEST_PATH=./diskimage_builder/tests/functional
|
||||
|
||||
[testenv:cover]
|
||||
setenv = PYTHON=coverage run --source diskimage_builder
|
||||
commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
|
||||
|
Loading…
Reference in New Issue
Block a user