From 9aa1667d95669abbb9282770ec6015581840985b Mon Sep 17 00:00:00 2001 From: "erikkay@chromium.org" Date: Wed, 30 Jun 2010 21:44:38 +0000 Subject: Make KeygenHandlerTest.ConcurrencyTest flaky on mac. BUG=48006 TEST=KeygenHandlerTest.ConcurrencyTest TBR=stuartmorgan,wtc Review URL: http://codereview.chromium.org/2827039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51292 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/keygen_handler_unittest.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'net/base') diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc index 15ec0ce..6d9d2d1 100644 --- a/net/base/keygen_handler_unittest.cc +++ b/net/base/keygen_handler_unittest.cc @@ -112,9 +112,16 @@ class ConcurrencyTestTask : public Task { std::string* result_; }; +// See crbug.com/48006 +#if defined(OS_MACOSX) +#define MAYBE_ConcurrencyTest FLAKY_ConcurrencyTest +#else +#define MAYBE_ConcurrencyTest ConcurrencyTest +#endif + // We asynchronously generate the keys so as not to hang up the IO thread. This // test tries to catch concurrency problems in the keygen implementation. -TEST_F(KeygenHandlerTest, ConcurrencyTest) { +TEST_F(KeygenHandlerTest, MAYBE_ConcurrencyTest) { const int NUM_HANDLERS = 5; base::WaitableEvent* events[NUM_HANDLERS] = { NULL }; std::string results[NUM_HANDLERS]; -- cgit v1.1