diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 02:18:06 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 02:18:06 +0000 |
| commit | 5a73ec6d0aa2362edfe5ee4a55ad98a806986621 (patch) | |
| tree | 009a0bc1d7dde0d2811c5ac7d5109f6782dc76fd /net | |
| parent | a37d5c52ff5212cb7a47687ffd8ac8493c16c0c2 (diff) | |
| download | chromium_src-5a73ec6d0aa2362edfe5ee4a55ad98a806986621.zip chromium_src-5a73ec6d0aa2362edfe5ee4a55ad98a806986621.tar.gz chromium_src-5a73ec6d0aa2362edfe5ee4a55ad98a806986621.tar.bz2 | |
Mark KeygenHandlerTest.ConcurrencyTest no longer flakey.
r51734 added the relevant locks.
BUG=48006
TEST=KeygenHandlerTest.ConcurrencyTest
Review URL: http://codereview.chromium.org/2978007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/keygen_handler_unittest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc index 6d9d2d1..15ec0ce 100644 --- a/net/base/keygen_handler_unittest.cc +++ b/net/base/keygen_handler_unittest.cc @@ -112,16 +112,9 @@ 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, MAYBE_ConcurrencyTest) { +TEST_F(KeygenHandlerTest, ConcurrencyTest) { const int NUM_HANDLERS = 5; base::WaitableEvent* events[NUM_HANDLERS] = { NULL }; std::string results[NUM_HANDLERS]; |