From 3ad87303eada513a757ac4af1bd526d377841196 Mon Sep 17 00:00:00 2001
From: Victor Costan <pwnall@chromium.org>
Date: Tue, 6 Mar 2018 18:35:15 +0000
Subject: [PATCH] Bug 1436996 [wpt PR 9435] - IndexedDB WPT: Break down
 interleaved-cursors test., a=testonly

Automatic update from web-platform-tests
The test is currently flaky on the CQ (see associated bug) due to timing
out. This CL breaks down the test in a -small and a -large file. The
size of the largest test is also reduced from 500 cursors to 250
cursors. The two changes combined should greatly reduce the chance of
timeouts.

Bug: 708175
Change-Id: Ic58c59740a0176e6bc5e6e87b66c5d772a67526a
Reviewed-on: https://chromium-review.googlesource.com/908248
Commit-Queue: Joshua Bell <jsbell@chromium.org>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#535411}

<!-- Reviewable:start -->

<!-- Reviewable:end -->

wpt-commits: 13b72a6d7631a855aec02993c1ae170d096de8ea
wpt-pr: 9435
reapplied-commits: 370e267e160568862f1fd9ec246ab5bb840f586e, fe4514c84e7ad28e46bad5da93381deb99b177f3, 7806af854343c043a2645a4034fdc7812f65daad, 9ddfd21554293dec5a4bf2e5375ae4f3c9f2ded0, 75f63c4d1ebc949647184fd60972fc7b9fd4affb, 1f3a5b496acd2288cc8cf0c32af86cb35157ea4e, 88b42bd5847abac58a62c4d6b33c1509bfce5f3d, 15c2e4c690700c6c115f8afe5e44ded10d943538, c8d461ef1437641ae7d4ea1d21e1e60cd62910b0, a6088a5f48ee299386a84d2f771902267d7355b1, 0634cd8f08ebe0905a9188fb1398c7b5f889c5dc, c8ee4a012dae506ae06bb5b2ad50942b04c1aaaa, c2c352456a4cf62dcc12f851138b04397675a445, b93a8879555d2fa7e7d4e00a275513a3a6338b35, b86e1331cb36634fd33677043b61fc0c1d8485bc, 44ddf14fd3346658c3223f13652073fafbfa48fa, a1a5840a6bb53e305ba02bcbeb215659342d0edb, 7465cb110ae5ec2e2ca73182caf5293f0efc8fd5, aad5349b3458bc3414e274b33fa86a1123901ff2, eca0907980d2769c449894a6277c60c1a306792f, 38626987c0cfd6e715cfcc6f4f1a1209191a03c5, e4a67f7ddcde6cd99348e9104bd7ed07074da44a, bb3c9990840a0fae2afc840b5952d7874785b112, 042d7adef0bdb9dc80e825c3997ace7519477c42, 99f1ea44fc7915b8b7b33bce4732fa8765fd3ac2, b81999f30c1516a70c153de51a0331d14c8faead
---
 testing/web-platform/meta/MANIFEST.json       | 29 ++++++++++++++++---
 ...ors.html => interleaved-cursors-common.js} | 14 ++-------
 .../IndexedDB/interleaved-cursors-large.html  | 12 ++++++++
 .../IndexedDB/interleaved-cursors-small.html  | 14 +++++++++
 4 files changed, 54 insertions(+), 15 deletions(-)
 rename testing/web-platform/tests/IndexedDB/{interleaved-cursors.html => interleaved-cursors-common.js} (94%)
 create mode 100644 testing/web-platform/tests/IndexedDB/interleaved-cursors-large.html
 create mode 100644 testing/web-platform/tests/IndexedDB/interleaved-cursors-small.html

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 4daaf4b88ec6..7b8ec65b0fe1 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -184790,6 +184790,11 @@
      {}
     ]
    ],
+   "IndexedDB/interleaved-cursors-common.js": [
+    [
+     {}
+    ]
+   ],
    "IndexedDB/nested-cloning-common.js": [
     [
      {}
@@ -302315,9 +302320,17 @@
      {}
     ]
    ],
-   "IndexedDB/interleaved-cursors.html": [
+   "IndexedDB/interleaved-cursors-large.html": [
     [
-     "/IndexedDB/interleaved-cursors.html",
+     "/IndexedDB/interleaved-cursors-large.html",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "IndexedDB/interleaved-cursors-small.html": [
+    [
+     "/IndexedDB/interleaved-cursors-small.html",
      {
       "timeout": "long"
      }
@@ -391572,8 +391585,16 @@
    "fdacaee0ed6b2a97b579495f5944df04e70b7deb",
    "testharness"
   ],
-  "IndexedDB/interleaved-cursors.html": [
-   "131b1965caae735de9ef8893e6ca55f24ce36f81",
+  "IndexedDB/interleaved-cursors-common.js": [
+   "6744105fe1a15a91058e3e5993f8a1f88548e3a3",
+   "support"
+  ],
+  "IndexedDB/interleaved-cursors-large.html": [
+   "4ee13538a407fe15fe310c8776d84c7526b7b363",
+   "testharness"
+  ],
+  "IndexedDB/interleaved-cursors-small.html": [
+   "04e4aad6c03ba0bc413a72f7674587816e1f63a2",
    "testharness"
   ],
   "IndexedDB/key-conversion-exceptions.htm": [
diff --git a/testing/web-platform/tests/IndexedDB/interleaved-cursors.html b/testing/web-platform/tests/IndexedDB/interleaved-cursors-common.js
similarity index 94%
rename from testing/web-platform/tests/IndexedDB/interleaved-cursors.html
rename to testing/web-platform/tests/IndexedDB/interleaved-cursors-common.js
index 31126908d83b..a76ec528c99c 100644
--- a/testing/web-platform/tests/IndexedDB/interleaved-cursors.html
+++ b/testing/web-platform/tests/IndexedDB/interleaved-cursors-common.js
@@ -1,12 +1,5 @@
-<!doctype html>
-<meta charset="utf-8">
-<meta name="timeout" content="long">
-<title>IndexedDB: Interleaved iteration of multiple cursors</title>
-<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="support-promises.js"></script>
-<script>
+// Infrastructure shared by interleaved-cursors-{small,large}.html
+
 // Number of objects that each iterator goes over.
 const itemCount = 10;
 
@@ -169,7 +162,7 @@ function interleaveCursors(testCase, store, cursorCount) {
   });
 }
 
-for (let cursorCount of [1, 10, 100, 500]) {
+function cursorTest(cursorCount) {
   promise_test(testCase => {
     return createDatabase(testCase, (database, transaction) => {
       const store = database.createObjectStore('cache',
@@ -193,4 +186,3 @@ for (let cursorCount of [1, 10, 100, 500]) {
     });
   }, `${cursorCount} cursors`);
 }
-</script>
diff --git a/testing/web-platform/tests/IndexedDB/interleaved-cursors-large.html b/testing/web-platform/tests/IndexedDB/interleaved-cursors-large.html
new file mode 100644
index 000000000000..6f4e440e1dac
--- /dev/null
+++ b/testing/web-platform/tests/IndexedDB/interleaved-cursors-large.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<title>IndexedDB: Interleaved iteration of multiple cursors</title>
+<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support-promises.js"></script>
+<script src="interleaved-cursors-common.js"></script>
+<script>
+cursorTest(250);
+</script>
diff --git a/testing/web-platform/tests/IndexedDB/interleaved-cursors-small.html b/testing/web-platform/tests/IndexedDB/interleaved-cursors-small.html
new file mode 100644
index 000000000000..a4c47771782f
--- /dev/null
+++ b/testing/web-platform/tests/IndexedDB/interleaved-cursors-small.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<title>IndexedDB: Interleaved iteration of multiple cursors</title>
+<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support-promises.js"></script>
+<script src="interleaved-cursors-common.js"></script>
+<script>
+cursorTest(1);
+cursorTest(10);
+cursorTest(100);
+</script>