From 41cba1d446c74329a96770b0d18805fd81a945fd Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Thu, 8 Apr 2021 21:20:36 +0200 Subject: [PATCH] Bug 1702830 - adjust expectations for websocket tests for intermittent failures. CLOSED TREE --- .../web-platform/meta/websockets/basic-auth.any.js.ini | 1 + .../meta/websockets/eventhandlers.any.js.ini | 10 ++-------- .../meta/websockets/stream/tentative/abort.any.js.ini | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/testing/web-platform/meta/websockets/basic-auth.any.js.ini b/testing/web-platform/meta/websockets/basic-auth.any.js.ini index 2cfa4a24fb07..2f979ffa38c1 100644 --- a/testing/web-platform/meta/websockets/basic-auth.any.js.ini +++ b/testing/web-platform/meta/websockets/basic-auth.any.js.ini @@ -20,6 +20,7 @@ [HTTP basic authentication should work with WebSockets] expected: if os == "linux": ["PASS", "FAIL"] + if not debug and not webrender and (os == "win") and (processor == "x86"): ["PASS", "TIMEOUT"] [basic-auth.any.sharedworker.html?wpt_flags=h2] diff --git a/testing/web-platform/meta/websockets/eventhandlers.any.js.ini b/testing/web-platform/meta/websockets/eventhandlers.any.js.ini index 9d2d9e229b3e..09a795e7f30d 100644 --- a/testing/web-platform/meta/websockets/eventhandlers.any.js.ini +++ b/testing/web-platform/meta/websockets/eventhandlers.any.js.ini @@ -4,10 +4,7 @@ if (os == "linux") and debug and webrender and not fission and not swgl: ["TIMEOUT", "CRASH"] if (os == "linux") and debug and webrender and fission: TIMEOUT if (os == "win") and (processor == "x86") and not debug: ["OK", "TIMEOUT"] - if (os == "android") and not debug and not webrender: ["TIMEOUT", "ERROR"] - if (os == "android") and not debug and webrender: ["TIMEOUT", "ERROR", "CRASH"] - if (os == "android") and debug and not webrender: ["TIMEOUT", "CRASH"] - if (os == "android") and debug and webrender: ["TIMEOUT", "OK", "CRASH", "ERROR"] + if (os == "android"): ["TIMEOUT", "OK", "CRASH", "ERROR"] if (os == "linux") and debug and not webrender: TIMEOUT if (os == "linux") and not debug: TIMEOUT @@ -24,8 +21,5 @@ if (os == "linux") and webrender and debug: TIMEOUT if (os == "linux") and webrender and not debug: ["TIMEOUT", "ERROR"] if (os == "win") and (processor == "x86") and not debug: ["OK", "TIMEOUT"] - if (os == "android") and not webrender and debug: ["TIMEOUT", "ERROR"] - if (os == "android") and not webrender and not debug: ["TIMEOUT", "CRASH", "ERROR"] - if (os == "android") and webrender and not debug: ["TIMEOUT", "ERROR"] - if (os == "android") and webrender and debug: ["ERROR", "TIMEOUT", "CRASH"] + if (os == "android"): ["TIMEOUT", "OK", "CRASH", "ERROR"] if (os == "linux") and not webrender: TIMEOUT diff --git a/testing/web-platform/meta/websockets/stream/tentative/abort.any.js.ini b/testing/web-platform/meta/websockets/stream/tentative/abort.any.js.ini index b8fb4d47648b..eb2b94a16e78 100644 --- a/testing/web-platform/meta/websockets/stream/tentative/abort.any.js.ini +++ b/testing/web-platform/meta/websockets/stream/tentative/abort.any.js.ini @@ -79,7 +79,7 @@ [abort.any.html?wpt_flags=h2] expected: - if (os == "linux") and not debug: ["ERROR", "TIMEOUT"] + if (os == "linux") and not debug: ["OK", "ERROR", "TIMEOUT"] if (os == "win") and (processor == "x86") and not debug: ["OK", "TIMEOUT"] if (os == "android") and debug and webrender: ["OK", "TIMEOUT", "CRASH"] if (os == "android") and debug and not webrender: ["OK", "ERROR", "TIMEOUT"]