Bug 1040769 - Enable test_bug570341.html; r=ehsan
authorGeoff Brown <gbrown@mozilla.com>
Tue, 22 Nov 2016 13:49:48 -0700
changeset 368835 8ff60c9990cc475789efb59de2c99a5d16dfb443
parent 368834 7a74c4841f0a13f54373b0a6681737f8f56147cc
child 368836 9a01c1474537dfdd25681180633f7ad14d234058
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1040769, 570341
milestone53.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 1040769 - Enable test_bug570341.html; r=ehsan
docshell/test/mochitest.ini
docshell/test/test_bug570341.html
--- a/docshell/test/mochitest.ini
+++ b/docshell/test/mochitest.ini
@@ -54,17 +54,16 @@ skip-if = toolkit != "cocoa"
 support-files = file_bug511449.html
 [test_bug529119-1.html]
 [test_bug529119-2.html]
 [test_bug530396.html]
 support-files = bug530396-noref.sjs bug530396-subframe.html
 [test_bug540462.html]
 [test_bug551225.html]
 [test_bug570341.html]
-skip-if = toolkit == 'android' && debug # Bug 1040769
 [test_bug580069.html]
 [test_bug590573.html]
 [test_bug598895.html]
 skip-if = toolkit == 'android'
 [test_bug634834.html]
 [test_bug637644.html]
 skip-if = toolkit == 'android'
 [test_bug640387_1.html]
--- a/docshell/test/test_bug570341.html
+++ b/docshell/test/test_bug570341.html
@@ -103,19 +103,20 @@ window.onload = function() {
     unload = Date.now();
   }, true);
   var seenLoad = 0;
   win.addEventListener('load', function (){
     seenLoad = Date.now();
   }, true);
   frames[0].location = 'bug570341_recordevents.html'
   var interval = setInterval(function () {
+    // time constants here are arbitrary, chosen to allow the test to pass
     var stopPolling = (win.performance && win.performance.loadEventEnd) ||
-                      (seenLoad && Date.now() >= seenLoad + 200) ||
-                      Date.now() >= start + 5000;
+                      (seenLoad && Date.now() >= seenLoad + 3000) ||
+                      Date.now() >= start + 30000;
     if (stopPolling) {
       clearInterval(interval);
       checkValues();
     } else if (win._testing_evt_load) {
       seenLoad = Date.now();
     }
   }, 100);
 }