Backed out changeset 1dbf68298734 (bug 1180754) for web platform test failures ON A CLOSED TREE
authorNigel Babu <nigelbabu@gmail.com>
Thu, 10 Sep 2015 13:10:30 +0530
changeset 294356 e55283c9b6a08e788c5f58196cf551c6674a72be
parent 294355 da4d79a712c697a4aa1b671933648ef35ea310bb
child 294357 63f9f2c908303da13f2ab8f19c35d7010ed31a58
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1180754
milestone43.0a1
backs out1dbf68298734ad14579849f3534fa07c6e897059
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1dbf68298734 (bug 1180754) for web platform test failures ON A CLOSED TREE
testing/web-platform/mozilla/meta/MANIFEST.json
testing/web-platform/mozilla/meta/service-workers/service-worker/serviceworkerobject-scripturl.sub.html.ini
testing/web-platform/mozilla/tests/service-workers/service-worker/resources/test-helpers.sub.js
testing/web-platform/mozilla/tests/service-workers/service-worker/serviceworkerobject-scripturl.https.html
testing/web-platform/mozilla/tests/service-workers/service-worker/serviceworkerobject-scripturl.sub.html
--- a/testing/web-platform/mozilla/meta/MANIFEST.json
+++ b/testing/web-platform/mozilla/meta/MANIFEST.json
@@ -431,20 +431,20 @@
           }
         ],
         "service-workers/service-worker/service-worker-csp-script.https.html": [
           {
             "path": "service-workers/service-worker/service-worker-csp-script.https.html",
             "url": "/_mozilla/service-workers/service-worker/service-worker-csp-script.https.html"
           }
         ],
-        "service-workers/service-worker/serviceworkerobject-scripturl.https.html": [
+        "service-workers/service-worker/serviceworkerobject-scripturl.sub.html": [
           {
-            "path": "service-workers/service-worker/serviceworkerobject-scripturl.https.html",
-            "url": "/_mozilla/service-workers/service-worker/serviceworkerobject-scripturl.https.html"
+            "path": "service-workers/service-worker/serviceworkerobject-scripturl.sub.html",
+            "url": "/_mozilla/service-workers/service-worker/serviceworkerobject-scripturl.sub.html"
           }
         ],
         "service-workers/service-worker/shared-worker-controlled.https.html": [
           {
             "path": "service-workers/service-worker/shared-worker-controlled.https.html",
             "url": "/_mozilla/service-workers/service-worker/shared-worker-controlled.https.html"
           }
         ],
@@ -547,9 +547,9 @@
       }
     },
     "reftest_nodes": {}
   },
   "reftest_nodes": {},
   "rev": null,
   "url_base": "/_mozilla/",
   "version": 2
-}
+}
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/serviceworkerobject-scripturl.sub.html.ini
@@ -0,0 +1,11 @@
+[serviceworkerobject-scripturl.sub.html]
+  type: testharness
+  [Verify the scriptURL property: relative]
+    expected: FAIL
+
+  [Verify the scriptURL property: with-fragment]
+    expected: FAIL
+
+  [Verify the scriptURL property: absolute]
+    expected: FAIL
+
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/test-helpers.sub.js
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/test-helpers.sub.js
@@ -8,23 +8,20 @@ function service_worker_unregister_and_r
   return service_worker_unregister(test, scope)
     .then(function() {
         return navigator.serviceWorker.register(url, options);
       })
     .catch(unreached_rejection(test,
                                'unregister and register should not fail'));
 }
 
-// This unregisters the registration that precisely matches scope. Use this
-// when unregistering by scope. If no registration is found, it just resolves.
-function service_worker_unregister(test, scope) {
-  var absoluteScope = (new URL(scope, window.location).href);
-  return navigator.serviceWorker.getRegistration(scope)
+function service_worker_unregister(test, documentUrl) {
+  return navigator.serviceWorker.getRegistration(documentUrl)
     .then(function(registration) {
-        if (registration && registration.scope === absoluteScope)
+        if (registration)
           return registration.unregister();
       })
     .catch(unreached_rejection(test, 'unregister should not fail'));
 }
 
 function service_worker_unregister_and_done(test, scope) {
   return service_worker_unregister(test, scope)
     .then(test.done.bind(test));
rename from testing/web-platform/mozilla/tests/service-workers/service-worker/serviceworkerobject-scripturl.https.html
rename to testing/web-platform/mozilla/tests/service-workers/service-worker/serviceworkerobject-scripturl.sub.html
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/serviceworkerobject-scripturl.https.html
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/serviceworkerobject-scripturl.sub.html
@@ -3,25 +3,26 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
 
 function url_test(name, url) {
   var scope = 'resources/scope/' + name;
   async_test(function(t) {
-    var expectedURL = (new URL(url, window.location)).toString();
+    var expectedURL = normalizeURL(url);
     service_worker_unregister_and_register(t, url, scope)
       .then(function(registration) {
           var worker = registration.installing;
           assert_equals(worker.scriptURL, expectedURL,
                         'Returned ServiceWorker object should have scriptURL');
           service_worker_unregister_and_done(t, scope);
         })
       .catch(unreached_rejection(t));
   }, 'Verify the scriptURL property: ' + name);
 }
 
 url_test('relative', 'resources/empty-worker.js');
 url_test('with-fragment', 'resources/empty-worker.js#ref');
-url_test('absolute', (new URL('./resources/empty-worker.js', window.location)).href);
+url_test('absolute',
+         'http://{{domains[www]}}:{{ports[http][0]}}/service-worker/resources/empty-worker.js');
 
 </script>