From 4b7fbf8ee0400b6d8be1e0ddda0a08899655d8bf Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Wed, 14 Mar 2018 17:55:12 -0700
Subject: [PATCH] test: fix serviceWorker test flakiness (#2195)

This patch starts waiting on serviceWorker registration.
---
 test/assets/serviceworkers/fetch/sw.html | 2 +-
 test/test.js                             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/assets/serviceworkers/fetch/sw.html b/test/assets/serviceworkers/fetch/sw.html
index f1dda345c3e..ee930cf443f 100644
--- a/test/assets/serviceworkers/fetch/sw.html
+++ b/test/assets/serviceworkers/fetch/sw.html
@@ -1,4 +1,4 @@
 <link rel="stylesheet" href="./style.css">
 <script>
-  navigator.serviceWorker.register('sw.js');
+  window.registrationPromise = navigator.serviceWorker.register('sw.js');
 </script>
diff --git a/test/test.js b/test/test.js
index 986c2f018b5..edc6ce1eb7f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2862,6 +2862,7 @@ describe('Page', function() {
 
       // Load and re-load to make sure serviceworker is installed and running.
       await page.goto(server.PREFIX + '/serviceworkers/fetch/sw.html', {waitUntil: 'networkidle2'});
+      await page.evaluate(async() => await window.registrationPromise);
       await page.reload();
 
       expect(responses.size).toBe(2);