Enforce 20s timeout for all unit tests.

1 files changed, 20 insertions, 4 deletions

diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index bdfbcac9a..3afb1a650 100644
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -1,7 +1,13 @@
-jQuery.noConflict(); // Allow the test to run with other libs or jQuery's.
+/**
+ * Allow the test suite to run with other libs or jQuery's.
+ */
+jQuery.noConflict();
 
-// jQuery-specific QUnit.reset
+/**
+ * QUnit hooks
+ */
 (function() {
+	// jQuery-specific QUnit.reset
 	var reset = QUnit.reset,
 		ajaxSettings = jQuery.ajaxSettings;
 
@@ -12,10 +18,20 @@ jQuery.noConflict(); // Allow the test to run with other libs or jQuery's.
 	};
 })();
 
-// load testswarm agent
+/**
+ * QUnit configuration
+ */
+// Max time for stop() and asyncTest() until it aborts test
+// and start()'s the next test.
+QUnit.config.testTimeout = 20 * 1000; // 20 seconds
+
+/**
+ * Load the TestSwarm listener if swarmURL is in the address.
+ */
 (function() {
 	var url = window.location.search;
-	url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) );
+	url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + "swarmURL=".length ) );
+
 	if ( !url || url.indexOf("http") !== 0 ) {
 		return;
 	}