From 891ebb8ff6dce40a9f38f42865b3c55000fbf1fc Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Mon, 19 May 2014 09:08:15 -0700
Subject: [PATCH] Attempt to detect more false test errors.

---
 test/backbone.html   |  7 +++++++
 test/index.html      | 11 +++++++++--
 test/saucelabs.js    | 23 ++++++++++++++---------
 test/underscore.html |  9 ++++++++-
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/test/backbone.html b/test/backbone.html
index 95c12d7a8..b603952c1 100644
--- a/test/backbone.html
+++ b/test/backbone.html
@@ -42,6 +42,13 @@
 				}
 			};
 
+			// avoid reporting tests to Sauce Labs when script errors occur
+			if (ui.isSauceLabs) {
+				window.onerror = function(message) {
+					QUnit.config.done.length = 0;
+					global_test_results = { 'message': message };
+				};
+			}
 			// load Lo-Dash
 			if (!ui.isModularize) {
 				document.write('<script src="' + ui.buildPath + '"><\/script>');
diff --git a/test/index.html b/test/index.html
index 3df5addef..0e6f0369e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -152,6 +152,15 @@
 				delete String.prototype._contains;
 			}
 
+			QUnit.config.hidepassed = true;
+
+			// avoid reporting tests to Sauce Labs when script errors occur
+			if (ui.isSauceLabs) {
+				window.onerror = function(message) {
+					QUnit.config.done.length = 0;
+					global_test_results = { 'message': message };
+				};
+			}
 			// load Lo-Dash and expose it to the bad extensions/shims
 			if (!ui.isModularize) {
 				addBizarroMethods();
@@ -159,8 +168,6 @@
 			}
 		</script>
 		<script>
-			QUnit.config.hidepassed = true;
-
 			// store Lo-Dash to test for bad extensions/shims
 			if (!ui.isModularize) {
 				var lodashBizarro = window._;
diff --git a/test/saucelabs.js b/test/saucelabs.js
index f0f83acaa..ece0e8b63 100644
--- a/test/saucelabs.js
+++ b/test/saucelabs.js
@@ -33,7 +33,7 @@ var maxJobRetries = 3,
 
 /** Used as the static file server middleware */
 var mount = ecstatic({
-  'cache': false,
+  'cache': 'no-cache',
   'root': process.cwd()
 });
 
@@ -55,6 +55,9 @@ var push = Array.prototype.push;
 /** Used to detect error messages */
 var reError = /\berror\b/i;
 
+/** Used to detect valid job ids */
+var reJobId = /^[a-z0-9]{32}$/;
+
 /** Used to display the wait throbber */
 var throbberDelay = 500,
     waitCount = -1;
@@ -70,7 +73,7 @@ var advisor = getOption('advisor', true),
     maxDuration = getOption('maxDuration', 360),
     port = ports[Math.min(_.sortedIndex(ports, getOption('port', 9001)), ports.length - 1)],
     publicAccess = getOption('public', true),
-    queueTimeout = getOption('queueTimeout', 360),
+    queueTimeout = getOption('queueTimeout', 600),
     recordVideo = getOption('recordVideo', true),
     recordScreenshots = getOption('recordScreenshots', false),
     runner = getOption('runner', 'test/index.html').replace(/^\W+/, ''),
@@ -399,7 +402,7 @@ function onJobStatus(error, res, body) {
       platform = options.platforms[0],
       description = browserName(platform[1]) + ' ' + platform[2] + ' on ' + capitalizeWords(platform[0]),
       elapsed = (_.now() - this.timestamp) / 1000,
-      errored = !jobResult || reError.test(message),
+      errored = !jobResult || reError.test(message) || reError.test(jobStatus),
       expired = (elapsed >= queueTimeout && !_.contains(jobStatus, 'in progress')),
       failures = _.result(jobResult, 'failed'),
       label = options.name + ':',
@@ -409,9 +412,11 @@ function onJobStatus(error, res, body) {
   if (!this.running || this.stopping) {
     return;
   }
-  this.id = jobId;
-  this.result = jobResult;
-  this.url = jobUrl;
+  if (reJobId.test(jobId)) {
+    this.id = jobId;
+    this.result = jobResult;
+    this.url = jobUrl;
+  }
   this.emit('status', jobStatus);
 
   if (!completed && !expired) {
@@ -524,8 +529,8 @@ Job.prototype.remove = function(callback) {
   this.removing = true;
   return this.stop(function() {
     var onRemove = _.bind(onJobRemove, this);
-    if (this.id == null) {
-      onRemove();
+    if (!reJobId.test(this.id)) {
+      _.defer(onRemove);
       return;
     }
     request.del(_.template('https://saucelabs.com/rest/v1/${user}/jobs/${id}', this), {
@@ -637,7 +642,7 @@ Job.prototype.stop = function(callback) {
     this.checking = false;
   }
   var onStop = _.bind(onGenericStop, this);
-  if (!this.running) {
+  if (!this.running || !reJobId.test(this.id)) {
     _.defer(onStop);
     return this;
   }
diff --git a/test/underscore.html b/test/underscore.html
index 98171e925..c9337d1c0 100644
--- a/test/underscore.html
+++ b/test/underscore.html
@@ -128,8 +128,15 @@
 				}
 			};
 
+			// avoid reporting tests to Sauce Labs when script errors occur
+			if (ui.isSauceLabs) {
+				window.onerror = function(message) {
+					QUnit.config.done.length = 0;
+					global_test_results = { 'message': message };
+				};
+			}
 			// only excuse in Sauce Labs (buggy Safari and timers)
-			if (!ui.isSauceLabs) {
+			else {
 				delete QUnit.config.excused.Chaining['select/reject/sortBy'];
 				delete QUnit.config.excused.Chaining['select/reject/sortBy in functional style'];
 				delete QUnit.config.excused.Functions['throttle repeatedly with results'];