From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 21 Jun 2014 17:34:03 +0000 (-0400)
Subject: Increase the test timeout on travis.
X-Git-Tag: v4.0.0b1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5ffe7adc8ad1a8e293afde0984a96b7c7637db4;p=thirdparty%2Ftornado.git

Increase the test timeout on travis.
---

diff --git a/.travis.yml b/.travis.yml
index 194c7bedb..228182f9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,9 @@ script:
     - cp ../.coveragerc .
     - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then export TORNADO_EXTENSION=1; fi
     - export TARGET="-m tornado.test.runtests"
+    # Travis workers are often overloaded and cause our tests to exceed
+    # the default timeout of 5s.
+    - export ASYNC_TEST_TIMEOUT=15
     # We use "python -m coverage" instead of the "bin/coverage" script
     # so we can pass additional arguments to python.  However, this doesn't
     # work on 2.6, so skip coverage on that version.