Bug 841505 et al - Disable test_xhr_timeout.html for frequent failures. r=khuey
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 26 Feb 2013 16:30:09 -0500
changeset 132248 ef4d2f93cc43ddfb2df707a9d67174819acb265a
parent 132247 548d4d12c0eff35c352d0e191684726224599d9e
child 132249 16d994cc562c0094f68ed38b5bf25918240bf5c6
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs841505
milestone21.0a2
Bug 841505 et al - Disable test_xhr_timeout.html for frequent failures. r=khuey
content/base/test/Makefile.in
dom/workers/test/Makefile.in
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -551,19 +551,16 @@ MOCHITEST_FILES_C= \
 		test_bug707142.html \
 		file_bug707142_baseline.json \
 		file_bug707142_bom.json \
 		file_bug707142_utf-16.json \
 		test_reentrant_flush.html \
 		test_bug708620.html \
 		file_bug708620.html \
 		file_bug708620-2.html \
-		test_XHR_timeout.html \
-		test_XHR_timeout.js \
-		file_XHR_timeout.sjs \
 		test_bug717511.html \
 		file_bug717511.html \
 		file_bug717511.html^headers^ \
 		file_bug717511_2.html \
 		file_bug717511_2.html^headers^ \
 		test_bug726364.html \
 		test_bug698381.html \
 		test_bug711047.html \
@@ -662,14 +659,19 @@ MOCHITEST_FILES_PARTS = $(foreach s,A B 
 # Disabled for now. Mochitest isn't reliable enough for these.
 # test_bug444546.html \
 # bug444546.sjs \
 
 # Disabled due to making the harness time out
 #		test_bug503473.html \
 #		file_bug503473-frame.sjs \
 
+# Disabled for frequent failures (bug 841505, bug 842344, etc)
+#		test_XHR_timeout.html \
+#		test_XHR_timeout.js \
+#		file_XHR_timeout.sjs \
+
 MOCHITEST_BROWSER_FILES = \
 		browser_bug593387.js \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/workers/test/Makefile.in
+++ b/dom/workers/test/Makefile.in
@@ -87,17 +87,16 @@ MOCHITEST_FILES = \
   test_newError.html \
   newError_worker.js \
   test_chromeWorker.html \
   WorkerTest_badworker.js \
   test_workersDisabled.html \
   workersDisabled_worker.js \
   test_xhr_implicit_cancel.html \
   xhr_implicit_cancel_worker.js \
-  test_xhr_timeout.html \
   test_xhr_parameters.html \
   test_xhr_parameters.js \
   test_xhr_system.html \
   test_xhr_system.js \
   test_blobConstructor.html \
   test_csp.html \
   test_csp.js \
   test_csp.html^headers^ \
@@ -107,16 +106,19 @@ MOCHITEST_FILES = \
   test_errorwarning.html \
   errorwarning_worker.js \
   test_contentWorker.html \
   content_worker.js \
   test_url.html \
   url_worker.js \
   $(NULL)
 
+# Disabled for frequent failures (bug 841505, bug 842344, etc)
+#  test_xhr_timeout.html \
+
 _SUBDIRMOCHITEST_FILES = \
   relativeLoad_sub_worker.js \
   relativeLoad_sub_worker2.js \
   relativeLoad_sub_import.js \
   $(NULL)
 
 MOCHITEST_CHROME_FILES = \
   test_chromeWorker.xul \