summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 18:55:44 +0000
committerkmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 18:55:44 +0000
commit18765fdca7deba833dd4bbddc99bdb996357cd2e (patch)
tree2e78337883f6606dd804339450fb60f1ef79b475
parent859f0e5edfc1c96195ad778be31fcfbd3bc552a5 (diff)
downloadchromium_src-18765fdca7deba833dd4bbddc99bdb996357cd2e.zip
chromium_src-18765fdca7deba833dd4bbddc99bdb996357cd2e.tar.gz
chromium_src-18765fdca7deba833dd4bbddc99bdb996357cd2e.tar.bz2
Disabled WorkerPoolTest.PostTaskAndReply test on Windows and Linux.
TBR=joi@chromium.org BUG=130337 TEST=none Review URL: https://chromiumcodereview.appspot.com/10443089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139594 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/threading/worker_pool_unittest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/base/threading/worker_pool_unittest.cc b/base/threading/worker_pool_unittest.cc
index 0452335..5f94e73 100644
--- a/base/threading/worker_pool_unittest.cc
+++ b/base/threading/worker_pool_unittest.cc
@@ -83,7 +83,14 @@ TEST_F(WorkerPoolTest, PostTask) {
long_test_event.Wait();
}
-TEST_F(WorkerPoolTest, PostTaskAndReply) {
+#if defined(OS_WIN) || defined(OS_LINUX)
+// Flaky on Windows and Linux (http://crbug.com/130337)
+#define MAYBE_PostTaskAndReply DISABLED_PostTaskAndReply
+#else
+#define MAYBE_PostTaskAndReply PostTaskAndReply
+#endif
+
+TEST_F(WorkerPoolTest, MAYBE_PostTaskAndReply) {
MessageLoop message_loop;
scoped_refptr<PostTaskAndReplyTester> tester(new PostTaskAndReplyTester());
tester->RunTest();