From 80a38b285d9a7fcc9ce11eea68237834f762aa4c Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Sat, 17 May 2014 22:17:48 -0700
Subject: [PATCH] Punt on AMD testing for Android because of stability issues.

---
 test/backbone.html   | 9 ---------
 test/index.html      | 9 ---------
 test/saucelabs.js    | 5 +++--
 test/underscore.html | 9 ---------
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/test/backbone.html b/test/backbone.html
index c2285cbca..95c12d7a8 100644
--- a/test/backbone.html
+++ b/test/backbone.html
@@ -73,15 +73,6 @@
 					mixinPrereqs(_);
 					return;
 				}
-				// avoid reporting tests to Sauce Labs when script load errors occur
-				if (ui.isSauceLabs) {
-					window.onerror = function() {
-						var loadEventEnd = ui.timing.loadEventEnd;
-						if (loadEventEnd && (new Date - loadEventEnd > 3000)) {
-							QUnit.config.done.length = 0;
-						}
-					};
-				}
 				var reBasename = /[\w.-]+$/,
 				    basePath = ('//' + location.host + location.pathname.replace(reBasename, '')).replace(/\btest\/$/, ''),
 				    modulePath = ui.buildPath.replace(/\.js$/, ''),
diff --git a/test/index.html b/test/index.html
index 96a59fc92..3df5addef 100644
--- a/test/index.html
+++ b/test/index.html
@@ -185,15 +185,6 @@
 				if (ui.isForeign || !window.require) {
 					return;
 				}
-				// avoid reporting tests to Sauce Labs when script load errors occur
-				if (ui.isSauceLabs) {
-					window.onerror = function() {
-						var loadEventEnd = ui.timing.loadEventEnd;
-						if (loadEventEnd && (new Date - loadEventEnd > 3000)) {
-							QUnit.config.done.length = 0;
-						}
-					};
-				}
 				var reBasename = /[\w.-]+$/,
 				    basePath = ('//' + location.host + location.pathname.replace(reBasename, '')).replace(/\btest\/$/, ''),
 				    modulePath = ui.buildPath.replace(/\.js$/, ''),
diff --git a/test/saucelabs.js b/test/saucelabs.js
index f8efc38c7..f0f83acaa 100644
--- a/test/saucelabs.js
+++ b/test/saucelabs.js
@@ -135,8 +135,9 @@ if (_.contains(tags, 'amd')) {
     var browser = browserName(platform[1]),
         version = +platform[2];
 
-    if (browser == 'Opera') {
-      return version >= 10;
+    switch (browser) {
+      case 'Android': return version >= 4.4;
+      case 'Opera': return version >= 10;
     }
     return true;
   });
diff --git a/test/underscore.html b/test/underscore.html
index 13127378b..98171e925 100644
--- a/test/underscore.html
+++ b/test/underscore.html
@@ -183,15 +183,6 @@
 				if (!window.require) {
 					return;
 				}
-				// avoid reporting tests to Sauce Labs when script load errors occur
-				if (ui.isSauceLabs) {
-					window.onerror = function() {
-						var loadEventEnd = ui.timing.loadEventEnd;
-						if (loadEventEnd && (new Date - loadEventEnd > 3000)) {
-							QUnit.config.done.length = 0;
-						}
-					};
-				}
 				var reBasename = /[\w.-]+$/,
 				    basePath = ('//' + location.host + location.pathname.replace(reBasename, '')).replace(/\btest\/$/, ''),
 				    modulePath = ui.buildPath.replace(/\.js$/, ''),