Backed out changeset c851a2a63dfd (bug 1216858) for w(4/8) failures CLOSED TREE

testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-connect.https.html.ini

@@ -1,7 +1,6 @@
 [service-worker-csp-connect.https.html]
   type: testharness
-  [Fetch test for connect-src]
-    expected: FAIL
-  [Redirected fetch test for connect-src]
-    expected: FAIL
+  expected: TIMEOUT
+  [CSP test for connect-src in ServiceWorkerGlobalScope]
+    expected: TIMEOUT
 

testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-default.https.html.ini

@@ -1,9 +1,6 @@
 [service-worker-csp-default.https.html]
   type: testharness
-  [importScripts test for default-src]
-    expected: FAIL
-  [Fetch test for default-src]
-    expected: FAIL
-  [Redirected fetch test for default-src]
-    expected: FAIL
+  expected: TIMEOUT
+  [CSP test for default-src in ServiceWorkerGlobalScope]
+    expected: TIMEOUT
 

testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-script.https.html.ini

@@ -0,0 +1,6 @@
+[service-worker-csp-script.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [CSP test for script-src in ServiceWorkerGlobalScope]
+    expected: TIMEOUT
+

testing/web-platform/mozilla/tests/service-workers/service-worker/resources/service-worker-csp-worker.py

@@ -8,8 +8,8 @@ var host_info = get_host_info();
 test(function() {
     var import_script_failed = false;
     try {
-      importScripts(host_info.HTTPS_REMOTE_ORIGIN +
-        base_path() + 'empty.js');
+      importScripts(host_info.HTTP_REMOTE_ORIGIN +
+        '/serviceworker/resources/empty.js');
     } catch(e) {
       import_script_failed = true;
     }
@@ -18,8 +18,8 @@ test(function() {
   }, 'importScripts test for default-src');
 
 async_test(function(t) {
-    fetch(host_info.HTTPS_REMOTE_ORIGIN +
-          base_path() + 'fetch-access-control.py?ACAOrigin=*',
+    fetch(host_info.HTTP_REMOTE_ORIGIN +
+          '/serviceworker/resources/fetch-access-control.php?ACAOrigin=*',
           {mode: 'cors'})
       .then(function(response){
           assert_unreached('fetch should fail.');
@@ -30,10 +30,10 @@ async_test(function(t) {
   }, 'Fetch test for default-src');
 
 async_test(function(t) {
-    var REDIRECT_URL = host_info.HTTPS_ORIGIN +
-      base_path() + 'redirect.py?Redirect=';
-    var OTHER_BASE_URL = host_info.HTTPS_REMOTE_ORIGIN +
-      base_path() + 'fetch-access-control.py?'
+    var REDIRECT_URL = host_info.HTTP_ORIGIN +
+      '/serviceworker/resources/redirect.php?Redirect=';
+    var OTHER_BASE_URL = host_info.HTTP_REMOTE_ORIGIN +
+      '/serviceworker/resources/fetch-access-control.php?'
     fetch(REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*'),
           {mode: 'cors'})
       .then(function(response){
@@ -54,8 +54,8 @@ var host_info = get_host_info();
 test(function() {
     var import_script_failed = false;
     try {
-      importScripts(host_info.HTTPS_REMOTE_ORIGIN +
-        base_path() + 'empty.js');
+      importScripts(host_info.HTTP_REMOTE_ORIGIN +
+        '/serviceworker/resources/empty.js');
     } catch(e) {
       import_script_failed = true;
     }
@@ -64,8 +64,8 @@ test(function() {
   }, 'importScripts test for script-src');
 
 async_test(function(t) {
-    fetch(host_info.HTTPS_REMOTE_ORIGIN +
-          base_path() + 'fetch-access-control.py?ACAOrigin=*',
+    fetch(host_info.HTTP_REMOTE_ORIGIN +
+          '/serviceworker/resources/fetch-access-control.php?ACAOrigin=*',
           {mode: 'cors'})
       .then(function(response){
           t.done();
@@ -76,10 +76,10 @@ async_test(function(t) {
   }, 'Fetch test for script-src');
 
 async_test(function(t) {
-    var REDIRECT_URL = host_info.HTTPS_ORIGIN +
-      base_path() + 'redirect.py?Redirect=';
-    var OTHER_BASE_URL = host_info.HTTPS_REMOTE_ORIGIN +
-      base_path() + 'fetch-access-control.py?'
+    var REDIRECT_URL = host_info.HTTP_ORIGIN +
+      '/serviceworker/resources/redirect.php?Redirect=';
+    var OTHER_BASE_URL = host_info.HTTP_REMOTE_ORIGIN +
+      '/serviceworker/resources/fetch-access-control.php?'
     fetch(REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*'),
           {mode: 'cors'})
       .then(function(response){
@@ -100,8 +100,8 @@ var host_info = get_host_info();
 test(function() {
     var import_script_failed = false;
     try {
-      importScripts(host_info.HTTPS_REMOTE_ORIGIN +
-        base_path() + 'empty.js');
+      importScripts(host_info.HTTP_REMOTE_ORIGIN +
+        '/serviceworker/resources/empty.js');
     } catch(e) {
       import_script_failed = true;
     }
@@ -110,8 +110,8 @@ test(function() {
   }, 'importScripts test for connect-src');
 
 async_test(function(t) {
-    fetch(host_info.HTTPS_REMOTE_ORIGIN +
-          base_path() + 'fetch-access-control.py?ACAOrigin=*',
+    fetch(host_info.HTTP_REMOTE_ORIGIN +
+          '/serviceworker/resources/fetch-access-control.php?ACAOrigin=*',
           {mode: 'cors'})
       .then(function(response){
           assert_unreached('fetch should fail.');
@@ -122,10 +122,10 @@ async_test(function(t) {
   }, 'Fetch test for connect-src');
 
 async_test(function(t) {
-    var REDIRECT_URL = host_info.HTTPS_ORIGIN +
-      base_path() + 'redirect.py?Redirect=';
-    var OTHER_BASE_URL = host_info.HTTPS_REMOTE_ORIGIN +
-      base_path() + 'fetch-access-control.py?'
+    var REDIRECT_URL = host_info.HTTP_ORIGIN +
+      '/serviceworker/resources/redirect.php?Redirect=';
+    var OTHER_BASE_URL = host_info.HTTP_REMOTE_ORIGIN +
+      '/serviceworker/resources/fetch-access-control.php?'
     fetch(REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*'),
           {mode: 'cors'})
       .then(function(response){