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

Unified Diff: content/worker/test/worker_uitest.cc

Issue 8539002: Mark yet-more worker ui tests as flaky. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/worker/test/worker_uitest.cc
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc
index 6ba0e8b20ed09bedab6d2c348bd187d9d927b020..5dbcb059b5c54a9671f03d7a9393a59dcc1c96f6 100644
--- a/content/worker/test/worker_uitest.cc
+++ b/content/worker/test/worker_uitest.cc
@@ -294,7 +294,7 @@ TEST_F(WorkerTest, FLAKY_WorkerConstructor) {
RunWorkerFastLayoutTest("worker-constructor.html");
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996
#define WorkerContextGc FLAKY_WorkerContextGc
#endif
@@ -310,7 +310,7 @@ TEST_F(WorkerTest, WorkerContextMultiPort) {
RunWorkerFastLayoutTest("worker-context-multi-port.html");
}
-#if defined(OS_MAC) || defined(OS_WIN)
+#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996
#define WorkerEventListener FLAKY_WorkerEventListener
#endif
@@ -378,7 +378,7 @@ TEST_F(WorkerTest, FLAKY_WorkerNavigator) {
RunWorkerFastLayoutTest("worker-navigator.html");
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
#define WorkerReplaceGlobalConstructor FLAKY_WorkerReplaceGlobalConstructor
#endif
@@ -394,7 +394,7 @@ TEST_F(WorkerTest, WorkerReplaceSelf) {
RunWorkerFastLayoutTest("worker-replace-self.html");
}
-#if defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
// Mac: http://crbug.com/44457
// Windows: http://crbug.com/101996
#define WorkerScriptError FLAKY_WorkerScriptError
@@ -403,7 +403,7 @@ TEST_F(WorkerTest, WorkerScriptError) {
RunWorkerFastLayoutTest("worker-script-error.html");
}
-#if defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
#define WorkerTerminate FLAKY_WorkerTerminate
#endif
@@ -411,7 +411,7 @@ TEST_F(WorkerTest, WorkerTerminate) {
RunWorkerFastLayoutTest("worker-terminate.html");
}
-#if defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
#define WorkerTimeout FLAKY_WorkerTimeout
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698