Test changes.

Differential Revision: https://phabricator.services.mozilla.com/D264457

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1360870
gecko-commit: 61e88493ad1533487f94c277bd0eb844b5de2ca6
gecko-reviewers: edenchuang, dom-worker-reviewers

Author: hsingh-moz

infrastructure/metadata/infrastructure/server/context.any.js.ini

@@ -4,10 +4,9 @@
       if product == "epiphany" or product == "webkit": FAIL # https://bugs.webkit.org/show_bug.cgi?id=200815
 
 [context.any.serviceworker-module.html]
-  expected:
-    if product == "firefox_android": [OK, ERROR]
-    # See e.g. https://community-tc.services.mozilla.com/tasks/IouM2LcdQy6b6ImEvgZ0kg
-    if product == "firefox": [ERROR, OK]
+  [context]
+    expected:
+      if product == "epiphany" or product == "webkit": FAIL # https://bugs.webkit.org/show_bug.cgi?id=200815
 
 [context.any.worker-module.html]
 

service-workers/service-worker/resources/registration-tests-script.js

@@ -30,21 +30,21 @@ function registration_tests_script(register_method, type) {
 
   promise_test(function(t) {
       var script = 'resources/malformed-worker.py?undefined-error';
-      var scope = 'resources/scope/undefined-error';
+      var scope = `resources/scope/undefined-error/${type}`;
       return promise_rejects_js(t,
           TypeError,
           register_method(script, {scope: scope}),
           'Registration of script including undefined error should fail.');
-    }, 'Registering script including undefined error');
+    }, `Registering script including undefined error: ${type}`);
 
   promise_test(function(t) {
       var script = 'resources/malformed-worker.py?uncaught-exception';
-      var scope = 'resources/scope/uncaught-exception';
+      var scope = `resources/scope/uncaught-exception/${type}`;
       return promise_rejects_js(t,
           TypeError,
           register_method(script, {scope: scope}),
           'Registration of script including uncaught exception should fail.');
-    }, 'Registering script including uncaught exception');
+    }, `Registering script including uncaught exception: ${type}`);
 
   if (type === 'classic') {
     promise_test(function(t) {