diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 00:02:15 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 00:02:15 +0000 |
| commit | 5186a830779cd96e2d9e388bbe6f1239e35a217f (patch) | |
| tree | 0c131261ba0b941bb0408302d82d38800377ce04 /net/base/keygen_handler_unittest.cc | |
| parent | 7fcce97e9d4605fa18a84fc46d3647e0b7a9240c (diff) | |
| download | chromium_src-5186a830779cd96e2d9e388bbe6f1239e35a217f.zip chromium_src-5186a830779cd96e2d9e388bbe6f1239e35a217f.tar.gz chromium_src-5186a830779cd96e2d9e388bbe6f1239e35a217f.tar.bz2 | |
Re-enable ConcurrencyTest
We disable it under Valgrind because it takes a while. The Chrome OS crash was
resolved in r51091.
R=agl
BUG=37289,47587
TEST=KeygenHandler.ConcurrencyTest
Review URL: http://codereview.chromium.org/2819029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/keygen_handler_unittest.cc')
| -rw-r--r-- | net/base/keygen_handler_unittest.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc index cf8319f..15ec0ce 100644 --- a/net/base/keygen_handler_unittest.cc +++ b/net/base/keygen_handler_unittest.cc @@ -114,9 +114,7 @@ class ConcurrencyTestTask : public Task { // 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. -// -// Disabled because it crashes on Chrome OS. See http://crbug.com/47587 -TEST_F(KeygenHandlerTest, DISABLED_ConcurrencyTest) { +TEST_F(KeygenHandlerTest, ConcurrencyTest) { const int NUM_HANDLERS = 5; base::WaitableEvent* events[NUM_HANDLERS] = { NULL }; std::string results[NUM_HANDLERS]; |