From 714ba1611125601e4eb21a2ceb5fa7f742d008b9 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 2 May 2016 16:51:49 -0700 Subject: [PATCH] disable py.test timeout by default, this breaks interactive debuggers --- .appveyor.yml | 2 +- .travis.yml | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a0eadb4ea..2e1a477fc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,7 +17,7 @@ install: - "dev.bat" - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\"" test_script: - - "py.test --cov netlib --cov mitmproxy --cov pathod" + - "py.test --timeout 60 --cov netlib --cov mitmproxy --cov pathod" cache: - C:\Users\appveyor\AppData\Local\pip\cache deploy_script: diff --git a/.travis.yml b/.travis.yml index 6bc4ddf31..7d3fbee8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ before_script: - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\"" script: - - "py.test --cov netlib --cov mitmproxy --cov pathod ./test/$SCOPE" + - "py.test --timeout 60 --cov netlib --cov mitmproxy --cov pathod ./test/$SCOPE" after_success: - coveralls diff --git a/setup.cfg b/setup.cfg index 7849ca079..d51ddc14e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,7 +9,7 @@ ignore = E251 [pytest] testpaths = test -addopts = --timeout 60 --capture=no +addopts = --capture=no [coverage:run] branch = True