diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 21:44:38 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 21:44:38 +0000 |
| commit | 9aa1667d95669abbb9282770ec6015581840985b (patch) | |
| tree | 5f2fd9c2694dd26dace337e47517ddcb67d522bd /net/base | |
| parent | ccec3ae65b82fa16307299eb5a05d9fd314b3cf4 (diff) | |
| download | chromium_src-9aa1667d95669abbb9282770ec6015581840985b.zip chromium_src-9aa1667d95669abbb9282770ec6015581840985b.tar.gz chromium_src-9aa1667d95669abbb9282770ec6015581840985b.tar.bz2 | |
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
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/keygen_handler_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
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]; |