diff options
| author | Benoit Pierre <benoit.pierre@gmail.com> | 2018-10-27 15:38:51 +0200 |
|---|---|---|
| committer | Benoit Pierre <benoit.pierre@gmail.com> | 2018-10-27 15:38:51 +0200 |
| commit | b82b21a40189feb1701745d4822a1e66802a50f9 (patch) | |
| tree | 2b16a04e8618fb915d547092fea1124d6b98c45e /.appveyor.yml | |
| parent | 1b68b7e8b24380ee687947bf908aaa6a90a67ab4 (diff) | |
| download | pip-b82b21a40189feb1701745d4822a1e66802a50f9.tar.gz | |
appveyor: merge back unit/integration runs
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index f3751517f..5d82748c9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,8 +2,6 @@ environment: matrix: # Unit and integration tests. - PYTHON: "C:\\Python27" - - PYTHON: "C:\\Python36-x64" - - PYTHON: "C:\\Python27" RUN_INTEGRATION_TESTS: "True" - PYTHON: "C:\\Python36-x64" RUN_INTEGRATION_TESTS: "True" @@ -35,6 +33,8 @@ cache: test_script: - ps: | + $ErrorActionPreference = "Stop" + function should_run_tests { if ("$env:APPVEYOR_PULL_REQUEST_NUMBER" -eq "") { Write-Host "Not a pull request - running tests" @@ -64,10 +64,8 @@ test_script: subst T: $env:TEMP $env:TEMP = "T:\" $env:TMP = "T:\" - if ($env:RUN_INTEGRATION_TESTS -eq "True") { - tox -e py -- --use-venv -m integration -n 3 --duration=5 - } - else { - tox -e py -- -m unit -n 3 + tox -e py -- -m unit + if ($LastExitCode -eq 0 -and $env:RUN_INTEGRATION_TESTS -eq "True") { + tox -e py -- --use-venv -m integration -n2 --durations=20 } } |