Bug 1340474 - Add long timeouts to some IndexedDB tests, a=testonly
☠☠ backed out by d013eeb6257e ☠ ☠
authorJames Graham <james@hoppipolla.co.uk>
Thu, 16 Feb 2017 13:32:25 +0000
changeset 343591 ca41058f451aa0f72f328b03a02d8beb040a0985
parent 343590 2c37642c6f4c7c0329e1f08a4734d0129b5cde0b
child 343592 e71b73c5012fd4f83ea2a9d214a2e48e4238cdd7
push id31382
push userkwierso@gmail.com
push dateFri, 17 Feb 2017 21:41:52 +0000
treeherdermozilla-central@0930fdc4cf8e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1340474
milestone54.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
Bug 1340474 - Add long timeouts to some IndexedDB tests, a=testonly MozReview-Commit-ID: L9l68yZ55eT
testing/web-platform/meta/IndexedDB/idb-binary-key-roundtrip.htm.ini
testing/web-platform/meta/IndexedDB/idbobjectstore_getKey.html.ini
testing/web-platform/meta/IndexedDB/key-conversion-exceptions.htm.ini
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/IndexedDB/idb-binary-key-roundtrip.htm
testing/web-platform/tests/IndexedDB/idbobjectstore_getKey.html
testing/web-platform/tests/IndexedDB/key-conversion-exceptions.htm
--- a/testing/web-platform/meta/IndexedDB/idb-binary-key-roundtrip.htm.ini
+++ b/testing/web-platform/meta/IndexedDB/idb-binary-key-roundtrip.htm.ini
@@ -1,14 +1,10 @@
 [idb-binary-key-roundtrip.htm]
   type: testharness
-  expected:
-    if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
   [Binary keys can be supplied using the view type Uint8Array]
     expected: FAIL
 
   [Binary keys can be supplied using the view type Uint8ClampedArray]
     expected: FAIL
 
   [Binary keys can be supplied using the view type Int8Array]
     expected: FAIL
@@ -36,76 +32,16 @@
 
   [DataView can be used to supply a binary key]
     expected: FAIL
 
   [DataView with explicit offset can be used to supply a binary key]
     expected: FAIL
 
   [DataView with explicit offset and length can be used to supply a binary key]
-    expected:
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    expected: FAIL
 
   [Uint8Array with explicit offset can be used to supply a binary key]
-    expected:
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    expected: FAIL
 
   [Uint8Array with explicit offset and length can be used to supply a binary key]
-    expected:
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    expected: FAIL
 
deleted file mode 100644
--- a/testing/web-platform/meta/IndexedDB/idbobjectstore_getKey.html.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[idbobjectstore_getKey.html]
-  type: testharness
-  expected:
-    if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [IDBObjectStore.getKey() - key generator and key path - range]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
-  [IDBObjectStore.getKey() - key generator and key path - key - no match]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
-  [IDBObjectStore.getKey() - key generator and key path - range - no match]
-    expected:
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
deleted file mode 100644
--- a/testing/web-platform/meta/IndexedDB/key-conversion-exceptions.htm.ini
+++ /dev/null
@@ -1,47 +0,0 @@
-[key-conversion-exceptions.htm]
-  type: testharness
-  expected:
-    if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [IDBIndex getKey() method with throwing/invalid keys]
-    expected:
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
-  [IDBIndex getAll() method with throwing/invalid keys]
-    expected:
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
-  [IDBIndex getAllKeys() method with throwing/invalid keys]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
-  [IDBIndex count() method with throwing/invalid keys]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
-  [IDBIndex openCursor() method with throwing/invalid keys]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
-  [IDBIndex openKeyCursor() method with throwing/invalid keys]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -77806,17 +77806,19 @@
     [
      "/IndexedDB/idb-binary-key-detached.htm",
      {}
     ]
    ],
    "IndexedDB/idb-binary-key-roundtrip.htm": [
     [
      "/IndexedDB/idb-binary-key-roundtrip.htm",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "IndexedDB/idb_binary_key_conversion.htm": [
     [
      "/IndexedDB/idb_binary_key_conversion.htm",
      {}
     ]
    ],
@@ -79248,17 +79250,19 @@
     [
      "/IndexedDB/idbobjectstore_getAllKeys.html",
      {}
     ]
    ],
    "IndexedDB/idbobjectstore_getKey.html": [
     [
      "/IndexedDB/idbobjectstore_getKey.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "IndexedDB/idbobjectstore_index.htm": [
     [
      "/IndexedDB/idbobjectstore_index.htm",
      {}
     ]
    ],
@@ -79446,17 +79450,19 @@
     [
      "/IndexedDB/interfaces.worker.html",
      {}
     ]
    ],
    "IndexedDB/key-conversion-exceptions.htm": [
     [
      "/IndexedDB/key-conversion-exceptions.htm",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "IndexedDB/key_invalid.htm": [
     [
      "/IndexedDB/key_invalid.htm",
      {}
     ]
    ],
@@ -133893,17 +133899,17 @@
    "0c4584e1b021a286445a2a9d3388ff011a1b933e",
    "testharness"
   ],
   "IndexedDB/idb-binary-key-detached.htm": [
    "e7ed8b831bce3a06d21d629cd0112480dfc0f6a5",
    "testharness"
   ],
   "IndexedDB/idb-binary-key-roundtrip.htm": [
-   "ed1e8ae0ca73fdc6fd4d15fcd7623f8f15b7f296",
+   "587b7c783d77450a2c9c1cc09ccaf530e6e5d363",
    "testharness"
   ],
   "IndexedDB/idb_binary_key_conversion.htm": [
    "7af8d37d63bbef60a973082f7b9fde99d5dcfca6",
    "testharness"
   ],
   "IndexedDB/idb_webworkers.htm": [
    "e57fd8321a437f3b6082c5d75025ad63bd007450",
@@ -134845,17 +134851,17 @@
    "c9387cbe39891986a41d494b64e640f3db28704f",
    "testharness"
   ],
   "IndexedDB/idbobjectstore_getAllKeys.html": [
    "bfb992f18be3cea8e6febebc22b2a524bfc8cb3a",
    "testharness"
   ],
   "IndexedDB/idbobjectstore_getKey.html": [
-   "58272cd29a4137d30247cef03da5576bd5beddc2",
+   "76906dde291ad82b93070aef7b1fcecae80adfff",
    "testharness"
   ],
   "IndexedDB/idbobjectstore_index.htm": [
    "c5393ba4c130c0591156914ffcdb63f1f61a54a0",
    "testharness"
   ],
   "IndexedDB/idbobjectstore_openCursor.htm": [
    "ab5ccdc2cf5db0104ac37d6204f026739df0b9b7",
@@ -134985,17 +134991,17 @@
    "0386e2b5923f9532549bfeeabc37dcc3528e3c78",
    "support"
   ],
   "IndexedDB/interfaces.worker.js": [
    "7edbb0cce85708e4b578ceae18a833fd623cd976",
    "testharness"
   ],
   "IndexedDB/key-conversion-exceptions.htm": [
-   "66c9ee49f2689e8917e5206f1bd2b9759b755d53",
+   "aed58068ec48e3fd682a195bd5b0ea3f87c5a0e7",
    "testharness"
   ],
   "IndexedDB/key_invalid.htm": [
    "8c0257c4231c413dde10c6f541f17f57634bff1c",
    "testharness"
   ],
   "IndexedDB/key_valid.html": [
    "85d0f455f5116e0754bf29fe6ba5052e7a7563a7",
@@ -179193,17 +179199,17 @@
    "3907beccfe4fddca1b2326f737bde4e87979926e",
    "testharness"
   ],
   "html/webappapis/scripting/events/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "html/webappapis/scripting/events/body-exposed-window-event-handlers.html": [
-   "d5c9f5ddded8fa916f7e63a90d45fc9e01aa34a6",
+   "11dc83c2b4c817e1eed694ed199d327e15abcfa6",
    "testharness"
   ],
   "html/webappapis/scripting/events/body-onload.html": [
    "c8e48064f18b1d1eb13e151b69ee60b8d68f4dab",
    "testharness"
   ],
   "html/webappapis/scripting/events/contains.json": [
    "2b05164b274d7719e27e3b9def3f25eaa156b839",
--- a/testing/web-platform/tests/IndexedDB/idb-binary-key-roundtrip.htm
+++ b/testing/web-platform/tests/IndexedDB/idb-binary-key-roundtrip.htm
@@ -1,11 +1,12 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>IndexedDB: Binary keys written to a database and read back</title>
+<meta name=timeout content=long>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support.js"></script>
 <script>
 
 const sample = [0x44, 0x33, 0x22, 0x11, 0xFF, 0xEE, 0xDD, 0xCC];
 const buffer = new Uint8Array(sample).buffer;
 
--- a/testing/web-platform/tests/IndexedDB/idbobjectstore_getKey.html
+++ b/testing/web-platform/tests/IndexedDB/idbobjectstore_getKey.html
@@ -1,11 +1,12 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>IndexedDB: Test IDBObjectStore.getKey()</title>
+<meta name=timeout content=long>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
 
 function getkey_test(func, name) {
     return async_test(function(t) {
         var del = indexedDB.deleteDatabase(name);
         del.onerror = t.unreached_func('deleteDatabase failed');
--- a/testing/web-platform/tests/IndexedDB/key-conversion-exceptions.htm
+++ b/testing/web-platform/tests/IndexedDB/key-conversion-exceptions.htm
@@ -1,11 +1,12 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>IndexedDB: Exceptions thrown during key conversion</title>
+<meta name=timeout content=long>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support.js"></script>
 <script>
 
 // Convenience function for tests that only need to run code in onupgradeneeded.
 function indexeddb_upgrade_only_test(upgrade_callback, description) {
   indexeddb_test(upgrade_callback, t => { t.done(); }, description);