Title: [197373] trunk/Tools
- Revision
- 197373
- Author
- beid...@apple.com
- Date
- 2016-02-29 16:08:27 -0800 (Mon, 29 Feb 2016)
Log Message
Fix timing flakiness in test I added in http://trac.webkit.org/changeset/197372
Unreviewed.
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-1.html:
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-2.html:
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm:
(TEST): Sometimes a third message from the first html file was leaking through. The message is expected
so we should always wait for it and make sure we got it.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (197372 => 197373)
--- trunk/Tools/ChangeLog 2016-02-29 23:13:35 UTC (rev 197372)
+++ trunk/Tools/ChangeLog 2016-03-01 00:08:27 UTC (rev 197373)
@@ -1,5 +1,17 @@
2016-02-29 Brady Eidson <beid...@apple.com>
+ Fix timing flakiness in test I added in http://trac.webkit.org/changeset/197372
+
+ Unreviewed.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-1.html:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-2.html:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm:
+ (TEST): Sometimes a third message from the first html file was leaking through. The message is expected
+ so we should always wait for it and make sure we got it.
+
+2016-02-29 Brady Eidson <beid...@apple.com>
+
Modern IDB: WebKit 2 IPC layer easily confused about multiple web processes being connected.
https://bugs.webkit.org/show_bug.cgi?id=154837
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-1.html (197372 => 197373)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-1.html 2016-02-29 23:13:35 UTC (rev 197372)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-1.html 2016-03-01 00:08:27 UTC (rev 197373)
@@ -8,7 +8,7 @@
request._onerror_ = function(e)
{
// Unexpected error
- window.webkit.messageHandlers.testHandler.postMessage('Error opening database');
+ window.webkit.messageHandlers.testHandler.postMessage('Error deleting database');
}
function continueTest()
@@ -17,13 +17,13 @@
request._onsuccess_ = function()
{
- window.webkit.messageHandlers.testHandler.postMessage('Success');
+ window.webkit.messageHandlers.testHandler.postMessage('Open success');
}
request._onerror_ = function()
{
// Unexpected error
- window.webkit.messageHandlers.testHandler.postMessage('Error');
+ window.webkit.messageHandlers.testHandler.postMessage('Unexpected error opening database');
}
request._onupgradeneeded_ = function(event)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-2.html (197372 => 197373)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-2.html 2016-02-29 23:13:35 UTC (rev 197372)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-2.html 2016-03-01 00:08:27 UTC (rev 197373)
@@ -14,14 +14,14 @@
req._onerror_ = function(event)
{
// Unexpected error
- window.webkit.messageHandlers.testHandler.postMessage('Unexpected error');
+ window.webkit.messageHandlers.testHandler.postMessage('Unexpected error getting value');
}
}
request._onerror_ = function()
{
// Unexpected error
- window.webkit.messageHandlers.testHandler.postMessage('Unexpected error');
+ window.webkit.messageHandlers.testHandler.postMessage('Unexpected error opening database');
}
request._onupgradeneeded_ = function(event)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm (197372 => 197373)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm 2016-02-29 23:13:35 UTC (rev 197372)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm 2016-03-01 00:08:27 UTC (rev 197373)
@@ -72,6 +72,10 @@
receivedScriptMessage = false;
RetainPtr<NSString> string2 = (NSString *)[lastScriptMessage body];
+ TestWebKitAPI::Util::run(&receivedScriptMessage);
+ receivedScriptMessage = false;
+ RetainPtr<NSString> string3 = (NSString *)[lastScriptMessage body];
+
// Make a new web view with a new web process to finish the test
RetainPtr<WKWebView> webView2 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
@@ -80,11 +84,12 @@
TestWebKitAPI::Util::run(&receivedScriptMessage);
receivedScriptMessage = false;
- RetainPtr<NSString> string3 = (NSString *)[lastScriptMessage body];
+ RetainPtr<NSString> string4 = (NSString *)[lastScriptMessage body];
EXPECT_WK_STREQ(@"UpgradeNeeded", string1.get());
EXPECT_WK_STREQ(@"Transaction complete", string2.get());
- EXPECT_WK_STREQ(@"Value of foo: bar", string3.get());
+ EXPECT_WK_STREQ(@"Open success", string3.get());
+ EXPECT_WK_STREQ(@"Value of foo: bar", string4.get());
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
