[ci] remove pytest-xdist dependency

Due to https://github.com/pypa/setuptools_scm/issues/164 we are unable
to install pytest-xdist

Change-Id: I52da4b071a1c57270e7dfbbe981a8eeeb839aba1
This commit is contained in:
Andrey Kurilin 2017-04-09 13:02:42 +03:00
parent a4dfb38cb7
commit 1c586f2773
3 changed files with 2 additions and 9 deletions

View File

@ -9,10 +9,6 @@ pytest>=2.7,<=3.0.7 # MIT
pytest-cov>=2.2.1,<=2.4.0 # MIT pytest-cov>=2.2.1,<=2.4.0 # MIT
# py.test plugin for generating HTML reports # py.test plugin for generating HTML reports
pytest-html>=1.10.0,<=1.14.2 # Mozilla Public License 2.0 (MPL 2.0) pytest-html>=1.10.0,<=1.14.2 # Mozilla Public License 2.0 (MPL 2.0)
# py.test xdist plugin for distributed testing and loop-on-failing modes
pytest-xdist<=1.15.0 # MIT
# py.test plugin to abort hanging tests
pytest-timeout<=1.2.0 # MIT
coverage>=4.0,<=4.3.4 # Apache License, Version 2.0 coverage>=4.0,<=4.3.4 # Apache License, Version 2.0
ddt>=1.0.1,<=1.1.1 ddt>=1.0.1,<=1.1.1

View File

@ -33,7 +33,7 @@ fi
git checkout HEAD^ git checkout HEAD^
baseline_report=$(mktemp -t rally_coverageXXXXXXX) baseline_report=$(mktemp -t rally_coverageXXXXXXX)
py.test --cov=rally tests/unit/ --cov-report=html --timeout=60 -n auto py.test --cov=rally tests/unit/ --cov-report=html
coverage report > $baseline_report coverage report > $baseline_report
mv cover cover-master mv cover cover-master
cat $baseline_report cat $baseline_report
@ -43,7 +43,7 @@ baseline_missing=$(awk 'END { print $3 }' $baseline_report)
git checkout - git checkout -
current_report=$(mktemp -t rally_coverageXXXXXXX) current_report=$(mktemp -t rally_coverageXXXXXXX)
py.test --cov=rally tests/unit/ --cov-report=html --timeout=60 -n auto py.test --cov=rally tests/unit/ --cov-report=html
coverage report > $current_report coverage report > $current_report
current_missing=$(awk 'END { print $3 }' $current_report) current_missing=$(awk 'END { print $3 }' $current_report)

View File

@ -21,12 +21,9 @@ PYTEST_REPORT = os.environ.get("PYTEST_REPORT",
".test_results/pytest_results.html") ".test_results/pytest_results.html")
TESTR_REPORT = "testr_results.html" TESTR_REPORT = "testr_results.html"
PYTEST_ARGUMENTS = ("py.test" # base command PYTEST_ARGUMENTS = ("py.test" # base command
" -vv" # show test names in logs
" --html=%(html_report)s" # html report " --html=%(html_report)s" # html report
" --self-contained-html" # embedded css " --self-contained-html" # embedded css
" --durations=10" # get a list of the slowest 10 tests " --durations=10" # get a list of the slowest 10 tests
" -n auto" # launch tests in parallel
" --timeout=%(timeout)s" # timeout for individual test
" %(path)s" " %(path)s"
) )