sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Don't run unit tests from run_functests.sh" into feature/v2

Browse Source
This commit is contained in:
Jenkins 2017-02-02 22:51:04 +00:00 committed by Gerrit Code Review
commit 03d1af7380
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/run_functests.sh
View File

@ -5,11 +5,6 @@ set -o pipefail
BASE_DIR=$(cd $(dirname "$0")/.. && pwd) 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 # then execute tests for elements
export DIB_CMD=disk-image-create export DIB_CMD=disk-image-create
export DIB_ELEMENTS=$(python -c ' export DIB_ELEMENTS=$(python -c '

3
tox.ini
View File

@ -24,9 +24,6 @@ commands = {posargs}
envdir = {toxworkdir}/venv envdir = {toxworkdir}/venv
commands = {toxinidir}/tests/run_functests.sh {posargs} commands = {toxinidir}/tests/run_functests.sh {posargs}
[testenv:python-functests]
setenv = OS_TEST_PATH=./diskimage_builder/tests/functional
[testenv:cover] [testenv:cover]
setenv = PYTHON=coverage run --source diskimage_builder setenv = PYTHON=coverage run --source diskimage_builder
commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi' commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'