Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5767)

Unified Diff: chrome_frame/test/chrome_frame_automation_mock.cc

Issue 9460019: Reduce flakiness in chrome_frame_tests.exe by having each run in a clean environment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed compile break Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/chrome_frame_automation_mock.h ('k') | chrome_frame/test/chrome_frame_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/chrome_frame_automation_mock.cc
diff --git a/chrome_frame/test/chrome_frame_automation_mock.cc b/chrome_frame/test/chrome_frame_automation_mock.cc
index 5dce4dfa46e8c6e124093892d3e2b10051ac889e..1f50b2efb8a2558fe3cb8c90937c60d2ac5cf681 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.cc
+++ b/chrome_frame/test/chrome_frame_automation_mock.cc
@@ -7,12 +7,8 @@
#include "testing/gtest/include/gtest/gtest.h"
const int kLongWaitTimeout = 25 * 1000;
-const int kShortWaitTimeout = 5 * 1000;
-// This test has been marked as flaky as it randomly times out on the CF
-// builders
-// http://code.google.com/p/chromium/issues/detail?id=81479
-TEST(ChromeFrame, DISABLED_Launch) {
+TEST(ChromeFrame, Launch) {
MessageLoopForUI loop;
AutomationMockLaunch mock_launch(&loop, kLongWaitTimeout);
@@ -45,9 +41,7 @@ TEST(ChromeFrame, PostMessage) {
EXPECT_FALSE(mock_postmessage.postmessage_result());
}
-// Marking this test as flaky as it fails randomly on the CF builders.
-// http://code.google.com/p/chromium/issues/detail?id=81479
-TEST(ChromeFrame, DISABLED_RequestStart) {
+TEST(ChromeFrame, RequestStart) {
MessageLoopForUI loop;
AutomationMockHostNetworkRequestStart mock_request_start(&loop,
kLongWaitTimeout);
« no previous file with comments | « chrome_frame/test/chrome_frame_automation_mock.h ('k') | chrome_frame/test/chrome_frame_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698