mozilla-beta: changeset 573943:3cdd21c5e484de85c344fe475dbeadb697bf886c

author	Blink WPT Bot <blink-w3c-test-autoroller@chromium.org>
	Tue, 21 Jan 2020 10:55:16 +0000
changeset 573943	3cdd21c5e484de85c344fe475dbeadb697bf886c
parent 573942	ae92caa7868148247b965667629072b95705849f
child 573944	0231963a7be9cd2c36edb1d9bb4416b622176982
push id	12662
push user	ffxbld-merge
push date	Mon, 10 Feb 2020 10:43:10 +0000
treeherder	mozilla-beta@ace4081e8200 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	testonly
bugs	1607136, 21046, 925740, 1984900, 732749, 54053982
milestone	74.0a1
first release with	nightly linux32 fb6b61e49217 / 74.0a1 / 20200123214224 / files nightly linux64 fb6b61e49217 / 74.0a1 / 20200123214224 / files nightly mac fb6b61e49217 / 74.0a1 / 20200123214224 / files nightly win32 fb6b61e49217 / 74.0a1 / 20200123214224 / files nightly win64 fb6b61e49217 / 74.0a1 / 20200123214224 / files
last release without	nightly linux32 a1669b599097 / 74.0a1 / 20200123095433 / files nightly linux64 a1669b599097 / 74.0a1 / 20200123095433 / files nightly mac a1669b599097 / 74.0a1 / 20200123095433 / files nightly win32 a1669b599097 / 74.0a1 / 20200123095433 / files nightly win64 a1669b599097 / 74.0a1 / 20200123095433 / files

Bug 1607136 [wpt PR 21046] - Sort the registrations returned by getRegistrations() by registration ID., a=testonly Automatic update from web-platform-tests Sort the registrations returned by getRegistrations() by registration ID. (#21046) This patch makes the order of the registrations returned by getRegistrations() be sorted by registration ID, which fixes the flaky test of getregistrations.https.html. Related Github issue is in https://github.com/w3c/ServiceWorker/issues/1465 Bug: 925740 Change-Id: Iaa5716eec886232df61bd23487fbae5c63413e9c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1984900 Reviewed-by: Makoto Shimazu <shimazu@chromium.org> Commit-Queue: Wei4 Wang <wei4.wang@intel.com> Cr-Commit-Position: refs/heads/master@{#732749} Co-authored-by: WangW_intel <54053982+wangw-1991@users.noreply.github.com> -- wpt-commits: 3b8990ef1b99135ad02f13b3389049921054c88f wpt-pr: 21046

--- a/testing/web-platform/tests/service-workers/service-worker/getregistrations.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/getregistrations.https.html
@@ -26,24 +26,29 @@ promise_test(async t => {
   const value = await navigator.serviceWorker.getRegistrations();
   assert_array_equals(value, registrations,
       'getRegistrations should resolve with an array of registrations');
 }, 'Register then getRegistrations');
 
 promise_test(async t => {
   const scope1 = 'resources/scope/getregistrations/scope1';
   const scope2 = 'resources/scope/getregistrations/scope2';
+  const scope3 = 'resources/scope/getregistrations/scope12';
+
   const script = 'resources/empty-worker.js';
   t.add_cleanup(() => service_worker_unregister(t, scope1));
   t.add_cleanup(() => service_worker_unregister(t, scope2));
+  t.add_cleanup(() => service_worker_unregister(t, scope3));
 
   const registrations = [
       await service_worker_unregister_and_register(t, script, scope1),
-      await service_worker_unregister_and_register(t, script, scope2)
+      await service_worker_unregister_and_register(t, script, scope2),
+      await service_worker_unregister_and_register(t, script, scope3),
   ];
+
   const value = await navigator.serviceWorker.getRegistrations();
   assert_array_equals(value, registrations);
 }, 'Register multiple times then getRegistrations');
 
 promise_test(async t => {
   const scope = 'resources/scope/getregistrations/register-unregister';
   const script = 'resources/empty-worker.js';
   const registration = await service_worker_unregister_and_register(t, script, scope);