Backed out changeset ca3375f6ba92 (bug 1447040) for frequently failing wpt /service-workers/cache-storage/serviceworker/cache-abort.https.html: remove files not removed because of conflict and re-run manifest udpate
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 16 Apr 2018 02:09:07 +0300
changeset 467356 f61c1a429d0550ce07a2c55e64a25b546c911920
parent 467355 c985ffee008d2d5daed2d5c83bf2bc2dbc221166
child 467357 c2256b9ae1fdd03a46eb1a7531213f1674440439
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1447040
milestone61.0a1
backs outca3375f6ba920ab96ad871db9eced0fb59c78d68
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 ca3375f6ba92 (bug 1447040) for frequently failing wpt /service-workers/cache-storage/serviceworker/cache-abort.https.html: remove files not removed because of conflict and re-run manifest udpate
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/service-workers/cache-storage/script-tests/cache-abort.js
testing/web-platform/tests/service-workers/cache-storage/serviceworker/cache-abort.https.html
testing/web-platform/tests/service-workers/cache-storage/window/cache-abort.https.html
testing/web-platform/tests/service-workers/cache-storage/worker/cache-abort.https.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -292779,21 +292779,16 @@
      {}
     ]
    ],
    "service-workers/cache-storage/resources/test-helpers.js": [
     [
      {}
     ]
    ],
-   "service-workers/cache-storage/script-tests/cache-abort.js": [
-    [
-     {}
-    ]
-   ],
    "service-workers/cache-storage/script-tests/cache-add.js": [
     [
      {}
     ]
    ],
    "service-workers/cache-storage/script-tests/cache-delete.js": [
     [
      {}
@@ -361979,22 +361974,16 @@
    "service-workers/cache-storage/common.https.html": [
     [
      "/service-workers/cache-storage/common.https.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "service-workers/cache-storage/serviceworker/cache-abort.https.html": [
-    [
-     "/service-workers/cache-storage/serviceworker/cache-abort.https.html",
-     {}
-    ]
-   ],
    "service-workers/cache-storage/serviceworker/cache-add.https.html": [
     [
      "/service-workers/cache-storage/serviceworker/cache-add.https.html",
      {
       "timeout": "long"
      }
     ]
    ],
@@ -362063,22 +362052,16 @@
     ]
    ],
    "service-workers/cache-storage/serviceworker/credentials.https.html": [
     [
      "/service-workers/cache-storage/serviceworker/credentials.https.html",
      {}
     ]
    ],
-   "service-workers/cache-storage/window/cache-abort.https.html": [
-    [
-     "/service-workers/cache-storage/window/cache-abort.https.html",
-     {}
-    ]
-   ],
    "service-workers/cache-storage/window/cache-add.https.html": [
     [
      "/service-workers/cache-storage/window/cache-add.https.html",
      {
       "timeout": "long"
      }
     ]
    ],
@@ -362149,22 +362132,16 @@
    "service-workers/cache-storage/window/sandboxed-iframes.https.html": [
     [
      "/service-workers/cache-storage/window/sandboxed-iframes.https.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "service-workers/cache-storage/worker/cache-abort.https.html": [
-    [
-     "/service-workers/cache-storage/worker/cache-abort.https.html",
-     {}
-    ]
-   ],
    "service-workers/cache-storage/worker/cache-add.https.html": [
     [
      "/service-workers/cache-storage/worker/cache-add.https.html",
      {
       "timeout": "long"
      }
     ]
    ],
@@ -595506,20 +595483,16 @@
   "service-workers/cache-storage/resources/simple.txt": [
    "50d3c65ca4a0fa1ae81d167e38426b8e57ae6dbe",
    "support"
   ],
   "service-workers/cache-storage/resources/test-helpers.js": [
    "fc315489c4d337f7cf8395beb4005be9c12da9d6",
    "support"
   ],
-  "service-workers/cache-storage/script-tests/cache-abort.js": [
-   "7c381e34a8e1444ad82645caf05ec8cbfe8360f8",
-   "support"
-  ],
   "service-workers/cache-storage/script-tests/cache-add.js": [
    "5807ce231254f89d9e5f2fc43955a8dda5bd865d",
    "support"
   ],
   "service-workers/cache-storage/script-tests/cache-delete.js": [
    "997017dfefc7c1f55cdc3122c2a58ff3d70b8141",
    "support"
   ],
@@ -595546,20 +595519,16 @@
   "service-workers/cache-storage/script-tests/cache-storage-match.js": [
    "e3cc14ea5d0587c43a5b142fca84788383b549cb",
    "support"
   ],
   "service-workers/cache-storage/script-tests/cache-storage.js": [
    "43a44ad35e90ce759de7a855f75b149b756029b4",
    "support"
   ],
-  "service-workers/cache-storage/serviceworker/cache-abort.https.html": [
-   "6b44436f3b2e1a463e64f3f5fc343086a295a975",
-   "testharness"
-  ],
   "service-workers/cache-storage/serviceworker/cache-add.https.html": [
    "294e76cb7b067b17fc9a0850bdab1d6e169cc25a",
    "testharness"
   ],
   "service-workers/cache-storage/serviceworker/cache-delete.https.html": [
    "6484fca817f556be3ffead18f162649c0fbfba30",
    "testharness"
   ],
@@ -595590,20 +595559,16 @@
   "service-workers/cache-storage/serviceworker/cache-storage.https.html": [
    "dbf2c5f7fdbd8a1e604d0e1d301d40a7146e93d8",
    "testharness"
   ],
   "service-workers/cache-storage/serviceworker/credentials.https.html": [
    "ef598649e75e3c8736729d7e233982748e31eb79",
    "testharness"
   ],
-  "service-workers/cache-storage/window/cache-abort.https.html": [
-   "2143ee1d78242bd2d055f6ea1b63a1becff657fe",
-   "testharness"
-  ],
   "service-workers/cache-storage/window/cache-add.https.html": [
    "d2c83935c4f413fa6f9459843a9ba669deb0e8ce",
    "testharness"
   ],
   "service-workers/cache-storage/window/cache-delete.https.html": [
    "8b02db13f96f2d9328e5a7cc4c55dd58bd23618c",
    "testharness"
   ],
@@ -595634,20 +595599,16 @@
   "service-workers/cache-storage/window/cache-storage.https.html": [
    "3ee65e5b5aadb6d64e9c094188378f84f121f53f",
    "testharness"
   ],
   "service-workers/cache-storage/window/sandboxed-iframes.https.html": [
    "dafb0d18e02c256a78188fdaf6997a1abd58b215",
    "testharness"
   ],
-  "service-workers/cache-storage/worker/cache-abort.https.html": [
-   "d67a78e50008a587d0b349daaacafc25a18cfd5b",
-   "testharness"
-  ],
   "service-workers/cache-storage/worker/cache-add.https.html": [
    "2cbea6be14f2f1852993be40744cac72a7fc62f6",
    "testharness"
   ],
   "service-workers/cache-storage/worker/cache-delete.https.html": [
    "6e75a546b1646e8a97aa43aa9cf5434402dca064",
    "testharness"
   ],
deleted file mode 100644
--- a/testing/web-platform/tests/service-workers/cache-storage/script-tests/cache-abort.js
+++ /dev/null
@@ -1,81 +0,0 @@
-if (self.importScripts) {
-  importScripts('/resources/testharness.js');
-  importScripts('../resources/test-helpers.js');
-  importScripts('/common/utils.js');
-}
-
-// We perform the same tests on put, add, addAll. Parameterise the tests to
-// reduce repetition.
-const methodsToTest = {
-  put: async (cache, request) => {
-    const response = await fetch(request);
-    return cache.put(request, response);
-  },
-  add: async (cache, request) => cache.add(request),
-  addAll: async (cache, request) => cache.addAll([request]),
-};
-
-for (const method in methodsToTest) {
-  const perform = methodsToTest[method];
-
-  cache_test(async (cache, test) => {
-    const controller = new AbortController();
-    const signal = controller.signal;
-    controller.abort();
-    const request = new Request('../resources/simple.txt', { signal });
-    return promise_rejects(test, 'AbortError', perform(cache, request),
-                          `${method} should reject`);
-  }, `${method}() on an already-aborted request should reject with AbortError`);
-
-  cache_test(async (cache, test) => {
-    const controller = new AbortController();
-    const signal = controller.signal;
-    const request = new Request('../resources/simple.txt', { signal });
-    const promise = perform(cache, request);
-    controller.abort();
-    return promise_rejects(test, 'AbortError', promise,
-                          `${method} should reject`);
-  }, `${method}() synchronously followed by abort should reject with ` +
-     `AbortError`);
-
-  cache_test(async (cache, test) => {
-    const controller = new AbortController();
-    const signal = controller.signal;
-    const stateKey = token();
-    const abortKey = token();
-    const request = new Request(
-        `../../../fetch/api/resources/infinite-slow-response.py?stateKey=${stateKey}&abortKey=${abortKey}`,
-        { signal });
-
-    const promise = perform(cache, request);
-
-    // Wait for the server to start sending the response body.
-    let opened = false;
-    do {
-      // Normally only one fetch to 'stash-take' is needed, but the fetches
-      // will be served in reverse order sometimes
-      // (i.e., 'stash-take' gets served before 'infinite-slow-response').
-
-      const response =
-            await fetch(`../../../fetch/api/resources/stash-take.py?key=${stateKey}`);
-      const body = await response.json();
-      if (body === 'open') opened = true;
-    } while (!opened);
-
-    // Sadly the above loop cannot guarantee that the browser has started
-    // processing the response body. This delay is needed to make the test
-    // failures non-flaky in Chrome version 66. My deepest apologies.
-    await new Promise(resolve => setTimeout(resolve, 250));
-
-    controller.abort();
-
-    await promise_rejects(test, 'AbortError', promise,
-                          `${method} should reject`);
-
-    // infinite-slow-response.py doesn't know when to stop.
-    return fetch(`../../../fetch/api/resources/stash-put.py?key=${abortKey}`);
-  }, `${method}() followed by abort after headers received should reject ` +
-     `with AbortError`);
-}
-
-done();
deleted file mode 100644
--- a/testing/web-platform/tests/service-workers/cache-storage/serviceworker/cache-abort.https.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<title>Cache Storage: Abort</title>
-<link rel="help" href="https://fetch.spec.whatwg.org/#request-signal">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../service-worker/resources/test-helpers.sub.js"></script>
-<script>
-service_worker_test('../script-tests/cache-abort.js');
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/service-workers/cache-storage/window/cache-abort.https.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<title>Cache Storage: Abort</title>
-<link rel="help" href="https://fetch.spec.whatwg.org/#request-signal">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helpers.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../script-tests/cache-abort.js"></script>
deleted file mode 100644
--- a/testing/web-platform/tests/service-workers/cache-storage/worker/cache-abort.https.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<title>>Cache Storage: Abort</title>
-<link rel="help" href="https://fetch.spec.whatwg.org/#request-signal">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-fetch_tests_from_worker(new Worker('../script-tests/cache-abort.js'));
-</script>