Bug 1454390 - Give link-upgrade test a long timeout, r=ato
authorJames Graham <james@hoppipolla.co.uk>
Thu, 19 Apr 2018 13:51:02 +0100
changeset 468175 fdb7b761a45a2fa3f154126cb5418f9dcd0e29bd
parent 468174 75cf0521f6f3e93bf81e1de228ff5b5de1e942cb
child 468176 85df37b45c47facfcba1d830a3869b4197cdd98b
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato
bugs1454390
milestone61.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 1454390 - Give link-upgrade test a long timeout, r=ato This test was frequently timing out in debug due to a short timeout in the test. MozReview-Commit-ID: KgbyGekWxE7
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/upgrade-insecure-requests/link-upgrade.sub.https.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -365942,17 +365942,19 @@
     [
      "/upgrade-insecure-requests/image-upgrade.https.html",
      {}
     ]
    ],
    "upgrade-insecure-requests/link-upgrade.sub.https.html": [
     [
      "/upgrade-insecure-requests/link-upgrade.sub.https.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "upgrade-insecure-requests/websocket-upgrade.https.html": [
     [
      "/upgrade-insecure-requests/websocket-upgrade.https.html",
      {}
     ]
    ],
@@ -602981,17 +602983,17 @@
    "9745045131b5b37094470dad2b59fa85c0fd1f0f",
    "testharness"
   ],
   "upgrade-insecure-requests/image-upgrade.https.html": [
    "22f2a05853efc4977d7c427f80898cd8671f3aaa",
    "testharness"
   ],
   "upgrade-insecure-requests/link-upgrade.sub.https.html": [
-   "0c7c3915c24e355f3353a242843c76bb17b13c62",
+   "314f8cbd0a8dd96da33d450a3b4b6b2317cad68f",
    "testharness"
   ],
   "upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html": [
    "05d450051981b22ac2b9e903b60435ca695b3ad2",
    "support"
   ],
   "upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html.headers": [
    "658f2c2be22add1a5be72b1e19ba340d024a4832",
--- a/testing/web-platform/tests/upgrade-insecure-requests/link-upgrade.sub.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/link-upgrade.sub.https.html
@@ -1,12 +1,13 @@
 <!DOCTYPE html>
 <html>
 
   <head>
+    <meta name="timeout" content="long">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
 
   <body>
     <script>
       const test_data = [
         {
@@ -51,14 +52,14 @@
           assert_true(w != undefined, "Popup must not be blocked");
 
           window.addEventListener("message", event => {
             if (event.data == data.done_message)
               test.done();
           });
         });
 
-        test.step_timeout(function(){test.force_timeout()}, 5000);
+        test.step_timeout(function(){test.force_timeout()}, 10000);
       }
     </script>
   </body>
 
 </html>