Modified: trunk/Source/WebKit2/ChangeLog (131875 => 131876)
--- trunk/Source/WebKit2/ChangeLog 2012-10-19 09:03:05 UTC (rev 131875)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-19 09:18:13 UTC (rev 131876)
@@ -1,3 +1,18 @@
+2012-10-19 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION (r130640 - r130644): TestCookieManager API test is failing
+ https://bugs.webkit.org/show_bug.cgi?id=98738
+
+ Reviewed by Philippe Normand.
+
+ For some reason the order of the domains in the array has changed,
+ but it doesn't really matter, what we want to check is that both
+ cookies have been accepted and the array contains both domains.
+
+ * UIProcess/API/gtk/tests/TestCookieManager.cpp:
+ (testCookieManagerAcceptPolicy): Check that first and third party
+ domains are present in the domains array.
+
2012-10-18 Carlos Garcia Campos <[email protected]>
WebPageProxy::canShowMIMEType() should return false for plugins when they are disabled
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp (131875 => 131876)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp 2012-10-19 09:03:05 UTC (rev 131875)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp 2012-10-19 09:18:13 UTC (rev 131876)
@@ -132,6 +132,17 @@
return m_domains;
}
+ bool hasDomain(const char* domain)
+ {
+ if (!m_domains)
+ return false;
+
+ for (size_t i = 0; m_domains[i]; ++i)
+ if (g_str_equal(m_domains[i], domain))
+ return true;
+ return false;
+ }
+
void deleteCookiesForDomain(const char* domain)
{
webkit_cookie_manager_delete_cookies_for_domain(m_cookieManager, domain);
@@ -178,8 +189,8 @@
domains = test->getDomains();
g_assert(domains);
g_assert_cmpint(g_strv_length(domains), ==, 2);
- g_assert_cmpstr(domains[0], ==, kFirstPartyDomain);
- g_assert_cmpstr(domains[1], ==, kThirdPartyDomain);
+ g_assert(test->hasDomain(kFirstPartyDomain));
+ g_assert(test->hasDomain(kThirdPartyDomain));
test->deleteAllCookies();
test->setAcceptPolicy(WEBKIT_COOKIE_POLICY_ACCEPT_NEVER);
Modified: trunk/Tools/ChangeLog (131875 => 131876)
--- trunk/Tools/ChangeLog 2012-10-19 09:03:05 UTC (rev 131875)
+++ trunk/Tools/ChangeLog 2012-10-19 09:18:13 UTC (rev 131876)
@@ -1,3 +1,13 @@
+2012-10-19 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION (r130640 - r130644): TestCookieManager API test is failing
+ https://bugs.webkit.org/show_bug.cgi?id=98738
+
+ Reviewed by Philippe Normand.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner): Unskip /webkit2/WebKitCookieManager/accept-policy.
+
2012-10-19 Tommy Widenflycht <[email protected]>
MediaStream API: Update the RuntimeEnabledFeatures flags
Modified: trunk/Tools/Scripts/run-gtk-tests (131875 => 131876)
--- trunk/Tools/Scripts/run-gtk-tests 2012-10-19 09:03:05 UTC (rev 131875)
+++ trunk/Tools/Scripts/run-gtk-tests 2012-10-19 09:18:13 UTC (rev 131876)
@@ -68,7 +68,6 @@
SkippedTest("WebKit2APITests/TestWebKitWebView", "/webkit2/WebKitWebView/mouse-target", "Test is flaky in GTK Linux 32-bit Release bot", 82866),
SkippedTest("WebKit2APITests/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),
SkippedTest("WebKit2APITests/TestWebKitFindController", "/webkit2/WebKitFindController/hide", "Test always fails in Xvfb", 89810),
- SkippedTest("WebKit2APITests/TestCookieManager", "/webkit2/WebKitCookieManager/accept-policy", "Test fails", 98738),
SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.WKConnection", "Tests fail and time out out", 84959),
SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.RestoreSessionStateContainingFormData", "Session State is not implemented in GTK+ port", 84960),
SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.SpacebarScrolling", "Test fails", 84961),
