mirror of https://github.com/pypa/pip
appveyor: merge back unit/integration runs
This commit is contained in:
parent
1b68b7e8b2
commit
b82b21a401
|
@ -1,8 +1,6 @@
|
||||||
environment:
|
environment:
|
||||||
matrix:
|
matrix:
|
||||||
# Unit and integration tests.
|
# Unit and integration tests.
|
||||||
- PYTHON: "C:\\Python27"
|
|
||||||
- PYTHON: "C:\\Python36-x64"
|
|
||||||
- PYTHON: "C:\\Python27"
|
- PYTHON: "C:\\Python27"
|
||||||
RUN_INTEGRATION_TESTS: "True"
|
RUN_INTEGRATION_TESTS: "True"
|
||||||
- PYTHON: "C:\\Python36-x64"
|
- PYTHON: "C:\\Python36-x64"
|
||||||
|
@ -35,6 +33,8 @@ cache:
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
- ps: |
|
- ps: |
|
||||||
|
$ErrorActionPreference = "Stop"
|
||||||
|
|
||||||
function should_run_tests {
|
function should_run_tests {
|
||||||
if ("$env:APPVEYOR_PULL_REQUEST_NUMBER" -eq "") {
|
if ("$env:APPVEYOR_PULL_REQUEST_NUMBER" -eq "") {
|
||||||
Write-Host "Not a pull request - running tests"
|
Write-Host "Not a pull request - running tests"
|
||||||
|
@ -64,10 +64,8 @@ test_script:
|
||||||
subst T: $env:TEMP
|
subst T: $env:TEMP
|
||||||
$env:TEMP = "T:\"
|
$env:TEMP = "T:\"
|
||||||
$env:TMP = "T:\"
|
$env:TMP = "T:\"
|
||||||
if ($env:RUN_INTEGRATION_TESTS -eq "True") {
|
tox -e py -- -m unit
|
||||||
tox -e py -- --use-venv -m integration -n 3 --duration=5
|
if ($LastExitCode -eq 0 -and $env:RUN_INTEGRATION_TESTS -eq "True") {
|
||||||
}
|
tox -e py -- --use-venv -m integration -n2 --durations=20
|
||||||
else {
|
|
||||||
tox -e py -- -m unit -n 3
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue