wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 366758c34e31 (bug 859591) for xpcshell failures.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-04-10 14:45:40 -04:00
parent c4a9ce956d
commit a7b2f083b6
6 changed files with 2 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/indexedDB/TransactionThreadPool.cpp
View File

@ -167,7 +167,8 @@ TransactionThreadPool::MaybeUnblockTransaction(nsPtrHashKey<TransactionInfo>* aK
NS_ASSERTION(maybeUnblockedInfo->blockedOn.Contains(finishedInfo),
"Huh?");
maybeUnblockedInfo->blockedOn.RemoveEntry(finishedInfo);
if (!maybeUnblockedInfo->blockedOn.Count()) {
if (!maybeUnblockedInfo->blockedOn.Count() &&
!maybeUnblockedInfo->transaction->IsAborted()) {
// Let this transaction run.
maybeUnblockedInfo->queue->Unblock();
}

1
dom/indexedDB/test/Makefile.in
View File

@ -98,7 +98,6 @@ MOCHITEST_FILES = \
test_third_party.html \
test_traffic_jam.html \
test_transaction_abort.html \
test_transaction_abort_hang.html \
test_transaction_lifetimes.html \
test_transaction_lifetimes_nested.html \
test_transaction_ordering.html \

19
dom/indexedDB/test/test_transaction_abort_hang.html
View File

@ -1,19 +0,0 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<html>
<head>
<title>Indexed Database Property Test</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="text/javascript;version=1.7" src="unit/test_transaction_abort_hang.js"></script>
<script type="text/javascript;version=1.7" src="helpers.js"></script>
</head>
<body onload="runTest();"></body>
</html>

1
dom/indexedDB/test/unit/Makefile.in
View File

@ -63,7 +63,6 @@ MOCHITEST_FILES = \
test_success_events_after_abort.js \
test_traffic_jam.js \
test_transaction_abort.js \
test_transaction_abort_hang.js \
test_transaction_lifetimes.js \
test_transaction_lifetimes_nested.js \
test_transaction_ordering.js \

91
dom/indexedDB/test/unit/test_transaction_abort_hang.js
View File

@ -1,91 +0,0 @@
/**
* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
"use strict";
var self = this;
var testGenerator = testSteps();
function testSteps()
{
const dbName = self.window ?
window.location.pathname :
"test_transaction_abort_hang";
const objStoreName = "foo";
const transactionCount = 30;
let completedTransactionCount = 0;
let caughtError = false;
let abortedTransactionIndex = Math.floor(transactionCount / 2);
if (abortedTransactionIndex % 2 == 0) {
abortedTransactionIndex++;
}
let request = indexedDB.open(name, 1);
request.onerror = errorHandler;
request.onupgradeneeded = grabEventAndContinueHandler;
let event = yield;
request.result.createObjectStore(objStoreName, { autoIncrement: true });
request.onupgradeneeded = null;
request.onsuccess = grabEventAndContinueHandler;
event = yield;
let db = event.target.result;
for (let i = 0; i < transactionCount; i++) {
const readonly = i % 2 == 0;
const mode = readonly ? "readonly" : "readwrite";
let transaction = db.transaction(objStoreName, mode);
if (i == transactionCount - 1) {
// Last one, finish the test.
transaction.oncomplete = grabEventAndContinueHandler;
} else if (i == abortedTransactionIndex - 1) {
transaction.oncomplete = function(event) {
ok(true, "Completed transaction " + ++completedTransactionCount +
" (We may hang after this!)");
};
} else if (i == abortedTransactionIndex) {
// Special transaction that we abort outside the normal event flow.
transaction.onerror = function(event) {
ok(true, "Aborted transaction " + ++completedTransactionCount +
" (We didn't hang!)");
is(event.target.error.name, "AbortError",
"AbortError set as the error on the request");
is(event.target.transaction.error, null,
"No error set on the transaction");
ok(!caughtError, "Haven't seen the error event yet");
caughtError = true;
event.preventDefault();
};
// This has to happen after the we return to the event loop but before the
// transaction starts running.
setTimeout(function() { transaction.abort(); }, 0);
} else {
transaction.oncomplete = function(event) {
ok(true, "Completed transaction " + ++completedTransactionCount);
};
}
if (readonly) {
transaction.objectStore(objStoreName).get(0);
} else {
try { transaction.objectStore(objStoreName).add({}); } catch(e) { }
}
}
ok(true, "Created all transactions");
event = yield;
ok(true, "Completed transaction " + ++completedTransactionCount);
ok(caughtError, "Caught the error event when we aborted the transaction");
finishTest();
yield;
}

1
dom/indexedDB/test/unit/xpcshell.ini
View File

@ -56,7 +56,6 @@ tail =
[test_success_events_after_abort.js]
[test_traffic_jam.js]
[test_transaction_abort.js]
[test_transaction_abort_hang.js]
[test_transaction_lifetimes.js]
[test_transaction_lifetimes_nested.js]
[test_transaction_ordering.js]