WPT importer should create serviceworker template for templated test that have worker as global

https://bugs.webkit.org/show_bug.cgi?id=230943

Reviewed by Jonathan Bedard.

Tests with a worker global should run in all worker global scope (dedicated worker, shared worker and service worker).
Let's add service worker by default for now.

* Scripts/webkitpy/w3c/test_importer.py:
* Scripts/webkitpy/w3c/test_importer_unittest.py:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@283230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Tools/ChangeLog

@@ -1,3 +1,16 @@
+2021-09-29  Youenn Fablet  <[email protected]>
+
+        WPT importer should create serviceworker template for templated test that have worker as global
+        https://bugs.webkit.org/show_bug.cgi?id=230943
+
+        Reviewed by Jonathan Bedard.
+
+        Tests with a worker global should run in all worker global scope (dedicated worker, shared worker and service worker).
+        Let's add service worker by default for now.
+
+        * Scripts/webkitpy/w3c/test_importer.py:
+        * Scripts/webkitpy/w3c/test_importer_unittest.py:
+
 2021-09-28  BJ Burg  <[email protected]>
 
         [Cocoa] Add SPI to select a tab created by _WKInspectorExtension

Tools/Scripts/webkitpy/w3c/test_importer.py

@@ -421,7 +421,9 @@ def readEnvironmentsForTemplateTest(self, filepath):
                 items = line.split('META: global=', 1)[1].split(',')
                 suffixes = [self.globalToSuffix.get(item.strip(), '') for item in items]
                 environments = list(filter(None, set(suffixes)))
-        return set(environments) if len(environments) else ['html', 'worker.html']
+        if 'worker.html' in environments:
+            environments.append('serviceworker.html')
+        return set(environments) if len(environments) else ['html', 'worker.html', 'serviceworker.html']
 
     def write_html_files_for_templated_js_tests(self, orig_filepath, new_filepath):
         if (orig_filepath.endswith('.window.js')):

Tools/Scripts/webkitpy/w3c/test_importer_unittest.py

@@ -367,10 +367,12 @@ def test_webkit_test_runner_options(self):
         self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.html'))
         self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.html'))
         self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.worker.html'))
+        self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.serviceworker.html'))
         self.assertTrue('<!-- webkit-test-runner [ dummy ] -->' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/web-platform-tests/css/test.html').split('\n')[0])
         self.assertTrue('<!-- webkit-test-runner [ dummy ] -->' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.html').split('\n')[0])
         self.assertTrue('<!-- webkit-test-runner [ dummy ] -->' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.html').split('\n')[0])
         self.assertFalse('<!-- webkit-test-runner [ dummy ] -->' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.worker.html').split('\n')[0])
+        self.assertFalse('<!-- webkit-test-runner [ dummy ] -->' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.serviceworker.html').split('\n')[0])
 
     def test_webkit_test_runner_import_reftests_with_absolute_paths_download(self):
         FAKE_FILES = {
@@ -440,6 +442,7 @@ def test_template_test(self):
         FAKE_FILES = {
             '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/t/test.any.js': '// META: global=window,dedicatedworker,sharedworker,serviceworker\n',
             '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/t/test2.any.js': '\n// META: global=dedicatedworker,serviceworker\n',
+            '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/t/test3.any.js': '\n// META: global=worker\n',
         }
         FAKE_FILES.update(FAKE_REPOSITORY)
 
@@ -452,3 +455,6 @@ def test_template_test(self):
         self.assertFalse(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test2.any.html'))
         self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test2.any.worker.html'))
         self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test2.any.serviceworker.html'))
+
+        self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test3.any.worker.html'))
+        self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test3.any.serviceworker.html'))