Backout rev 56b28c7bc989 (bug 1415740 p2) for failing WPT manifest linting. r=me
authorBen Kelly <ben@wanderview.com>
Fri, 10 Nov 2017 00:28:59 -0800
changeset 444429 9c74e8d1e1c3c31fe672058c4d6e09dd07f512ad
parent 444428 944b91410e49b8d3079b4cc14dcec0a612e0d019
child 444430 4762a6f8723887fc72c7adc28da8ee5731f0aa8d
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1415740
milestone58.0a1
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
Backout rev 56b28c7bc989 (bug 1415740 p2) for failing WPT manifest linting. r=me
testing/web-platform/tests/service-workers/service-worker/resource-timing.https.html
testing/web-platform/tests/service-workers/service-worker/resources/resource-timing-iframe.html
testing/web-platform/tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html
--- a/testing/web-platform/tests/service-workers/service-worker/resource-timing.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resource-timing.https.html
@@ -3,74 +3,52 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
 function resourceUrl(path) {
     return get_host_info()['HTTPS_ORIGIN'] + base_path() + path;
 }
 
-function crossOriginUrl(path) {
-    return get_host_info()['HTTPS_REMOTE_ORIGIN'] + base_path() + path;
-}
-
-function verify(performance, resource, mode, description) {
-    var url = mode === 'cross-origin' ? crossOriginUrl(resource)
-                                      : resourceUrl(resource);
-    var entryList = performance.getEntries();
-    var entry = performance.getEntriesByName(url)[0];
+function verify(performance, resource, description) {
+    var entry = performance.getEntriesByName(resourceUrl(resource))[0];
     assert_greater_than(entry.workerStart, 0, description);
     assert_greater_than_equal(entry.workerStart, entry.startTime, description);
     assert_less_than_equal(entry.workerStart, entry.fetchStart, description);
-    if (mode === 'cross-origin') {
-      assert_equals(entry.responseStart, 0, description);
-      assert_greater_than_equal(entry.responseEnd, entry.fetchStart, description);
-    } else {
-      assert_greater_than_equal(entry.responseStart, entry.fetchStart, description);
-      assert_greater_than_equal(entry.responseEnd, entry.responseStart, description);
-    }
+    assert_greater_than_equal(entry.responseStart, entry.fetchStart, description);
+    assert_greater_than_equal(entry.responseEnd, entry.responseStart, description);
     assert_greater_than(entry.responseEnd, entry.fetchStart, description);
     assert_greater_than(entry.duration, 0, description);
     if (resource.indexOf('redirect.py') != -1) {
         assert_less_than_equal(entry.workerStart, entry.redirectStart,
                                description);
     } else {
         assert_equals(entry.redirectStart, 0, description);
     }
 }
 
 async_test(function(t) {
     var worker_url = 'resources/resource-timing-worker.js';
-    var scope = 'resources/resource-timing-iframe.sub.html';
+    var scope = 'resources/resource-timing-iframe.html';
     var registration;
 
     service_worker_unregister_and_register(t, worker_url, scope)
       .then(function(r) {
           registration = r;
           return wait_for_state(t, r.installing, 'activated');
         })
       .then(function() {
           return with_iframe(scope);
         })
       .then(function(frame) {
           var performance = frame.contentWindow.performance;
-          verify(performance, 'resources/dummy.js', 'same-origin',
-                 'Generated response');
-          verify(performance, 'resources/empty.js', 'same-origin',
-                 'Network fallback');
+          verify(performance, 'resources/dummy.js', 'Generated response');
+          verify(performance, 'resources/empty.js', 'Network fallback');
           verify(performance, 'resources/redirect.py?Redirect=empty.js',
-                 'same-origin', 'Redirect');
-          verify(performance, 'resources/missing.jpg', 'same-origin',
-                 'Network fallback image');
-
-          // Test that worker start is available on cross-origin no-cors
-          // subresources.
-          verify(performance, 'resources/missing.jpg', 'cross-origin',
-                 'Network fallback cross-origin image');
-
+                 'Redirect');
           frame.remove();
           return registration.unregister();
         })
       .then(function() {
           t.done();
         })
       .catch(unreached_rejection(t));
 }, 'Controlled resource loads');
rename from testing/web-platform/tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html
rename to testing/web-platform/tests/service-workers/service-worker/resources/resource-timing-iframe.html
--- a/testing/web-platform/tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/resource-timing-iframe.html
@@ -1,6 +1,4 @@
 <!DOCTYPE html>
 <script src="empty.js"></script>
 <script src="dummy.js"></script>
 <script src="redirect.py?Redirect=empty.js"></script>
-<img src="missing.jpg">
-<img src="https://{{domains[www1]}}:{{ports[https][0]}}/service-workers/service-worker/resources/missing.jpg">