From 6608b29c0538d894696a8c9c75cd040dd1597b40 Mon Sep 17 00:00:00 2001 From: "joi@chromium.org" Date: Wed, 9 Nov 2011 11:39:03 +0000 Subject: Revert 109223 - Mark more WorkerTest flakiness. TBR=finnur@chromium.org BUG=101996 Review URL: http://codereview.chromium.org/8505010 TBR=joi@chromium.org Review URL: http://codereview.chromium.org/8505011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109224 0039d316-1c4b-4281-b951-d872f2087c98 --- content/worker/test/worker_uitest.cc | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) (limited to 'content/worker') diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc index d10625b..ced13a3 100644 --- a/content/worker/test/worker_uitest.cc +++ b/content/worker/test/worker_uitest.cc @@ -255,14 +255,7 @@ TEST_F(WorkerTest, SharedWorkerHttpAuth) { // dialogs displayed by non-navigating tabs. } -#if defined(OS_WIN) -// http://crbug.com/101996 -#define MAYBE_StressJSExecution) FLAKY_StressJSExecution -#else -#define MAYBE_StressJSExecution StressJSExecution -#endif - -TEST_F(WorkerTest, MAYBE_StressJSExecution) { +TEST_F(WorkerTest, StressJSExecution) { RunWorkerFastLayoutTest("stress-js-execution.html"); } @@ -277,14 +270,7 @@ TEST_F(WorkerTest, MAYBE_UseMachineStack) { RunWorkerFastLayoutTest("use-machine-stack.html"); } -#if defined(OS_WIN) -// http://crbug.com/101996 -#define MAYBE_WorkerCall FLAKY_WorkerCall -#else -#define MAYBE_WorkerCall WorkerCall -#endif - -TEST_F(WorkerTest, MAYBE_WorkerCall) { +TEST_F(WorkerTest, WorkerCall) { RunWorkerFastLayoutTest("worker-call.html"); } @@ -294,7 +280,7 @@ TEST_F(WorkerTest, DISABLED_WorkerClonePort) { RunWorkerFastLayoutTest("worker-cloneport.html"); } -#if defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_WIN) // http://crbug.com/101996 #define MAYBE_WorkerCloseFast FLAKY_WorkerCloseFast #else @@ -364,14 +350,7 @@ TEST_F(WorkerTest, DISABLED_WorkerLifecycle) { RunWorkerFastLayoutTest("worker-lifecycle.html"); } -#if defined(OS_WIN) -// http://crbug.com/101996 -#define MAYBE_WorkerLocation FLAKY_WorkerLocation -#else -#define MAYBE_WorkerLocation WorkerLocation -#endif - -TEST_F(WorkerTest, MAYBE_WorkerLocation) { +TEST_F(WorkerTest, WorkerLocation) { RunWorkerFastLayoutTest("worker-location.html"); } @@ -889,13 +868,6 @@ class WorkerFileSystemTest : public WorkerTest { #define MAYBE_AsyncOperations FLAKY_AsyncOperations #define MAYBE_SyncOperations FLAKY_SyncOperations #define MAYBE_FileEntryToURISync FLAKY_FileEntryToURISync -#elif defined(OS_MACOSX) -#define MAYBE_Temporary Temporary -#define MAYBE_Persistent Persistent -#define MAYBE_SyncTemporary SyncTemporary -#define MAYBE_AsyncOperations AsyncOperations -#define MAYBE_SyncOperations FLAKY_SyncOperations -#define MAYBE_FileEntryToURISync FileEntryToURISync #else #define MAYBE_Temporary Temporary #define MAYBE_Persistent Persistent -- cgit v1.1