aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Gołębiowski <m.goleb@gmail.com>2015-04-26 17:11:10 +0200
committerMichał Gołębiowski <m.goleb@gmail.com>2015-04-27 20:38:12 +0200
commitc0a07778fd3a1f6c91fda67916ad492553ef2282 (patch)
tree5e2860d0873ad70f9beb1bb67972a9b82503f585
parent35295f1c20d6f4ce724840ecad00d347ca5a1295 (diff)
downloadjquery-c0a07778fd3a1f6c91fda67916ad492553ef2282.tar.gz
jquery-c0a07778fd3a1f6c91fda67916ad492553ef2282.zip
Tests: Increase QUnit timeout
Android 2.3 is very slow & times out a lot in async tests, they have to be restarted multiple times to settle. Long test execution is not a huge problem as Android 2.3 is tested only periodically during the night, unstable tests are a bigger problem. This might mitigate that. In a regular scenario almost all tests should pass so increasing the timeout for all browsers shouldn't have a huge impact on overall test time. (cherry-picked from ff18d8e2060ae7c15c7694dc6bcbbeb9cbfbdaa4) Closes gh-2232
-rw-r--r--test/data/testrunner.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index 4719a67d9..d1e8b8fa8 100644
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -16,7 +16,7 @@ var reset,
// Max time for stop() and asyncTest() until it aborts test
// and start()'s the next test.
-QUnit.config.testTimeout = 2e4; // 20 seconds
+QUnit.config.testTimeout = 12e4; // 2 minutes
// Enforce an "expect" argument or expect() call in all test bodies.
QUnit.config.requireExpects = true;