Fix clear-window-name.https.html fail message

This test produced different output every time it failed since a
randomly generated string was being passed to assert_equals. This patch
does the same check but prevents the generated string from getting into
the error message so we can include it in our failing test expectations.

Fixed: 1129420
Change-Id: I5cffb6c3dfbe7bb551a626780273291d732f6e1b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2416727
Commit-Queue: Joey Arhar <jarhar@chromium.org>
Reviewed-by: Mason Freed <masonfreed@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808576}

third_party/blink/web_tests/TestExpectations

@@ -2673,8 +2673,6 @@ crbug.com/958381 [ Mac ] external/wpt/css/CSS2/tables/table-anonymous-objects-19
 crbug.com/958381 [ Mac ] external/wpt/css/CSS2/tables/table-anonymous-objects-205.xht [ Failure ]
 crbug.com/958381 [ Mac ] external/wpt/css/CSS2/tables/table-anonymous-objects-206.xht [ Failure ]
 
-crbug.com/1129420 external/wpt/html/browsers/windows/clear-window-name.https.html [ Failure ]
-
 # ====== New tests from wpt-importer added here ======
 crbug.com/626703 [ Fuchsia ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-pause-immediately.https.html [ Failure ]
 crbug.com/626703 [ Mac11.0 ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-pause-immediately.https.html [ Failure ]

third_party/blink/web_tests/platform/linux/external/wpt/html/browsers/windows/clear-window-name.https-expected.txt → third_party/blink/web_tests/external/wpt/html/browsers/windows/clear-window-name.https-expected.txt

@@ -2,11 +2,11 @@ This is a testharness.js-based test.
 PASS Window.name is not reset when there is an opener around
 PASS Window.name is not reset when there is an opener around (cross-origin)
 PASS Window.name is not reset at the first navigation away from initial about:blank with noopener
-FAIL Window.name is reset at the first cross-origin navigation with noopener assert_equals: expected "" but got "73d3b9ef-1a2d-45ce-8b97-575a37d635d3"
+FAIL Window.name is reset at the first cross-origin navigation with noopener assert_unreached: Stash result does not equal expected result. Reached unreachable code
 PASS Window.name is not reset at the first navigation away from initial about:blank with window.opener set to null
 PASS Window.name is not reset at the same-origin navigation with window.opener set to null
-FAIL Window.name is reset at the first first cross-origin navigation with window.opener set to null assert_equals: expected "" but got "f8518422-a53e-4149-b4aa-e592a7c4d5d4"
+FAIL Window.name is reset at the first first cross-origin navigation with window.opener set to null assert_unreached: Stash result does not equal expected result. Reached unreachable code
 PASS Window.name is set by the window
-FAIL Window.name is reset at the first cross-origin navigation assert_equals: expected "" but got "f5f87800-3a80-4fcb-a2e0-72a3f42bbf14"
+FAIL Window.name is reset at the first cross-origin navigation assert_unreached: Stash result does not equal expected result. Reached unreachable code
 Harness: the test ran to completion.
 

third_party/blink/web_tests/external/wpt/html/browsers/windows/clear-window-name.https.html

@@ -29,7 +29,9 @@ function pollResultAndCheck(t, id, expected) {
 
 
       if (res !== "NONE") {
-        t.step(() => assert_equals(res, expected));
+        if (res !== expected) {
+          t.step(() => assert_unreached('Stash result does not equal expected result.'));
+        }
         t.done();
         resolve();
       } else {

third_party/blink/web_tests/platform/mac-mac10.13/external/wpt/html/browsers/windows/clear-window-name.https-expected.txt

-This is a testharness.js-based test.
-PASS Window.name is not reset when there is an opener around
-PASS Window.name is not reset when there is an opener around (cross-origin)
-PASS Window.name is not reset at the first navigation away from initial about:blank with noopener
-FAIL Window.name is reset at the first cross-origin navigation with noopener assert_equals: expected "" but got "5f27de37-84b7-4e33-bac7-6c71128c0d66"
-PASS Window.name is not reset at the first navigation away from initial about:blank with window.opener set to null
-PASS Window.name is not reset at the same-origin navigation with window.opener set to null
-FAIL Window.name is reset at the first first cross-origin navigation with window.opener set to null assert_equals: expected "" but got "397c255c-84d5-477e-a131-20610dd52049"
-PASS Window.name is set by the window
-FAIL Window.name is reset at the first cross-origin navigation assert_equals: expected "" but got "1437d363-b984-437d-ac5a-df696dfb416c"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/platform/mac-mac10.14/external/wpt/html/browsers/windows/clear-window-name.https-expected.txt

-This is a testharness.js-based test.
-PASS Window.name is not reset when there is an opener around
-PASS Window.name is not reset when there is an opener around (cross-origin)
-PASS Window.name is not reset at the first navigation away from initial about:blank with noopener
-FAIL Window.name is reset at the first cross-origin navigation with noopener assert_equals: expected "" but got "226f125c-5ecd-4b28-b1fd-34f4c31d59ff"
-PASS Window.name is not reset at the first navigation away from initial about:blank with window.opener set to null
-PASS Window.name is not reset at the same-origin navigation with window.opener set to null
-FAIL Window.name is reset at the first first cross-origin navigation with window.opener set to null assert_equals: expected "" but got "b56be3ce-f279-4df4-aae9-c6d1d1807c15"
-PASS Window.name is set by the window
-FAIL Window.name is reset at the first cross-origin navigation assert_equals: expected "" but got "d865e2b1-1e5c-46d9-b64c-413f9f967973"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/platform/mac-mac10.15/external/wpt/html/browsers/windows/clear-window-name.https-expected.txt

-This is a testharness.js-based test.
-PASS Window.name is not reset when there is an opener around
-PASS Window.name is not reset when there is an opener around (cross-origin)
-PASS Window.name is not reset at the first navigation away from initial about:blank with noopener
-FAIL Window.name is reset at the first cross-origin navigation with noopener assert_equals: expected "" but got "af835388-79e2-4051-920c-00689786c08b"
-PASS Window.name is not reset at the first navigation away from initial about:blank with window.opener set to null
-PASS Window.name is not reset at the same-origin navigation with window.opener set to null
-FAIL Window.name is reset at the first first cross-origin navigation with window.opener set to null assert_equals: expected "" but got "48d9612c-e122-4cae-9ef2-03ae3386015b"
-PASS Window.name is set by the window
-FAIL Window.name is reset at the first cross-origin navigation assert_equals: expected "" but got "008dc857-24e2-4fdf-ac54-083d8847c04c"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/platform/mac/external/wpt/html/browsers/windows/clear-window-name.https-expected.txt

-This is a testharness.js-based test.
-PASS Window.name is not reset when there is an opener around
-PASS Window.name is not reset when there is an opener around (cross-origin)
-PASS Window.name is not reset at the first navigation away from initial about:blank with noopener
-FAIL Window.name is reset at the first cross-origin navigation with noopener assert_equals: expected "" but got "5c9611a5-e210-4535-a99d-5edd35cd8297"
-PASS Window.name is not reset at the first navigation away from initial about:blank with window.opener set to null
-PASS Window.name is not reset at the same-origin navigation with window.opener set to null
-FAIL Window.name is reset at the first first cross-origin navigation with window.opener set to null assert_equals: expected "" but got "251019f0-8b9b-4998-8c44-f237354d528b"
-PASS Window.name is set by the window
-FAIL Window.name is reset at the first cross-origin navigation assert_equals: expected "" but got "1e59a1a2-bfe5-4bfb-a91d-21c550e72ae3"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/platform/win/external/wpt/html/browsers/windows/clear-window-name.https-expected.txt

-This is a testharness.js-based test.
-PASS Window.name is not reset when there is an opener around
-PASS Window.name is not reset when there is an opener around (cross-origin)
-PASS Window.name is not reset at the first navigation away from initial about:blank with noopener
-FAIL Window.name is reset at the first cross-origin navigation with noopener assert_equals: expected "" but got "eb079c65-a867-49a6-877f-f814ab0b0da4"
-PASS Window.name is not reset at the first navigation away from initial about:blank with window.opener set to null
-PASS Window.name is not reset at the same-origin navigation with window.opener set to null
-FAIL Window.name is reset at the first first cross-origin navigation with window.opener set to null assert_equals: expected "" but got "3bfa50ca-8ae2-4e17-87d7-40a03a0848db"
-PASS Window.name is set by the window
-FAIL Window.name is reset at the first cross-origin navigation assert_equals: expected "" but got "7ab69acf-1cc3-477c-85af-3670ff4c79ee"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/platform/win7/external/wpt/html/browsers/windows/clear-window-name.https-expected.txt

-This is a testharness.js-based test.
-PASS Window.name is not reset when there is an opener around
-PASS Window.name is not reset when there is an opener around (cross-origin)
-PASS Window.name is not reset at the first navigation away from initial about:blank with noopener
-FAIL Window.name is reset at the first cross-origin navigation with noopener assert_equals: expected "" but got "d46e5b2c-5c05-451c-935e-543decd7a9d5"
-PASS Window.name is not reset at the first navigation away from initial about:blank with window.opener set to null
-PASS Window.name is not reset at the same-origin navigation with window.opener set to null
-FAIL Window.name is reset at the first first cross-origin navigation with window.opener set to null assert_equals: expected "" but got "52bacf95-3f22-4c3b-b513-9cda8e285438"
-PASS Window.name is set by the window
-FAIL Window.name is reset at the first cross-origin navigation assert_equals: expected "" but got "d5b084b2-e6da-4200-a04c-de3d9c9ff296"
-Harness: the test ran to completion.
-