Bug 1454390 - Give link-upgrade test a long timeout, r=ato draft
authorJames Graham <james@hoppipolla.co.uk>
Thu, 19 Apr 2018 13:51:02 +0100
changeset 785073 7ea9a9b1c507a29a1741c1529496e26e728c0191
parent 784946 8ed49dd81059dfdd876cf62ad5def1cfa56ffbbf
push id107122
push userbmo:james@hoppipolla.co.uk
push dateThu, 19 Apr 2018 15:03:08 +0000
reviewersato
bugs1454390
milestone61.0a1
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>