Skip to content

Commit

Permalink
Bug 1610918 [wpt PR 21351] - CookieStore: Fix Flaky WPT Test for getS…
Browse files Browse the repository at this point in the history
…ubscriptions, a=testonly

Automatic update from web-platform-tests
CookieStore: Fix Flaky WPT Test for getSubscriptions

This test fails because the cleanup to "unsubscribe" cookies would
occur after the registration has already been unregistered for
non-workers.  This change removes the cleanup to "unsubscribe" and
just relies on "unregister" for cleanup.

The flaky failures can be reproduced locally using the following gn args
and commandline. (Googlers: http://screen/E7px76cVS2E)

gn args:
dcheck_always_on = true
ffmpeg_branding = "Chrome"
is_component_build = false
is_debug = false
mac_deterministic_build = true
proprietary_codecs = true
symbol_level = 1
use_goma = true

command: python third_party/blink/tools/run_web_tests.py -t LinuxTest third_party/blink/web_tests/external/wpt/cookie-store/cookieStoreManager_getSubscriptions_multiple.tentative.https.any.js --gtest_repeat=20

Bug: 1029713
Change-Id: Ifa766b974bddfcc6ee43e60be0766c1cb80cb742
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2014100
Commit-Queue: Ayu Ishii <ayuichromium.org>
Reviewed-by: Victor Costan <pwnallchromium.org>
Cr-Commit-Position: refs/heads/master{#734193}

--

wpt-commits: b3e087acabf346e7013a5a8182a5a4bf8b94b453
wpt-pr: 21351

UltraBlame original commit: 409fdb69ccdfafab27129a2aa965a2de9b60777d
  • Loading branch information
marco-c committed Jan 28, 2020
1 parent 3d3c2ab commit d553eb6
Showing 1 changed file with 70 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,38 @@ add_cleanup
)
=
>
{
/
/
For
non
-
ServiceWorker
environments
registration
.
unregister
(
)
cleans
up
/
/
cookie
subscriptions
.
if
(
self
.
GLOBAL
.
isWorker
(
)
)
{
return
registration
.
cookies
Expand All @@ -363,6 +395,9 @@ unsubscribe
(
subscriptions
)
;
}
}
)
;
}
Expand Down Expand Up @@ -419,6 +454,38 @@ add_cleanup
)
=
>
{
/
/
For
non
-
ServiceWorker
environments
registration
.
unregister
(
)
cleans
up
/
/
cookie
subscriptions
.
if
(
self
.
GLOBAL
.
isWorker
(
)
)
{
return
registration
.
cookies
Expand All @@ -427,6 +494,9 @@ unsubscribe
(
subscriptions
)
;
}
}
)
;
}
Expand Down

0 comments on commit d553eb6

Please sign in to comment.