Bug 844025 et al. - Re-enable test_xhr_timeout.html. r=me
authorRyan VanderMeulen <ryanvm@gmail.com>
Sat, 31 Aug 2013 10:15:56 -0400
changeset 145178 d6d5d6ef2a9439cee4b05d5af42ddf4a9d577068
parent 145177 c0104d0c88a124009ef06bb857b5e69fd7e52d7f
child 145179 6e30a25722bbdbbf30bbae2bacbb51031ab17513
push id25199
push userryanvm@gmail.com
push dateSat, 31 Aug 2013 20:51:27 +0000
treeherdermozilla-central@b6c29e434519 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs844025
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 844025 et al. - Re-enable test_xhr_timeout.html. r=me
content/base/test/Makefile.in
dom/workers/test/Makefile.in
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -547,16 +547,19 @@ 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 \
@@ -696,20 +699,15 @@ 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 \
 		browser_bug902350.js \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/workers/test/Makefile.in
+++ b/dom/workers/test/Makefile.in
@@ -88,34 +88,32 @@ MOCHITEST_FILES = \
   test_workersDisabled.html \
   workersDisabled_worker.js \
   test_xhr_implicit_cancel.html \
   xhr_implicit_cancel_worker.js \
   test_xhr_parameters.html \
   test_xhr_parameters.js \
   test_xhr_system.html \
   test_xhr_system.js \
+  test_xhr_timeout.html \
   test_blobConstructor.html \
   test_csp.html \
   test_csp.js \
   test_csp.html^headers^ \
   csp_worker.js \
   test_transferable.html \
   transferable_worker.js \
   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 \
-
 MOCHITEST_CHROME_FILES = \
   test_chromeWorker.xul \
   test_chromeWorkerJSM.xul \
   test_extension.xul \
   test_extensionBootstrap.xul \
   test_file.xul \
   test_fileSlice.xul \
   test_fileBlobPosting.xul \