Merge pull request #11315 from web-platform-tests/importscripts-fix

Correct importScripts() behavior test
web-platform-tests · Jun 3, 2018 · ee82278 · ee82278
2 parents 1dc612f + 15951e2
commit ee82278
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/service-workers/service-worker/import-scripts-updated-flag.https.html b/service-workers/service-worker/import-scripts-updated-flag.https.html
@@ -75,7 +75,7 @@
           return post_and_wait_for_reply(worker, 'message');
         })
       .then(result => {
-          assert_equals(result.error, 'TypeError');
+          assert_equals(result.error, 'NetworkError');
           assert_equals(result.value, null);
         });
   }, 'import script not previously imported');

diff --git a/service-workers/service-worker/resources/import-scripts-updated-flag-worker.js b/service-workers/service-worker/resources/import-scripts-updated-flag-worker.js
@@ -4,6 +4,7 @@ let echo_output = null;
 
 // Tests importing a script that sets |echo_output| to the query string.
 function test_import(str) {
+  echo_output = null;
   importScripts('import-scripts-echo.py?msg=' + str);
   assert_equals(echo_output, str);
 }
@@ -18,6 +19,7 @@ self.addEventListener('install', () => {
 
 self.addEventListener('message', e => {
     var error = null;
+    echo_output = null;
 
     try {
       importScripts('import-scripts-echo.py?msg=' + e.data);