summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-03 02:05:02 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-03 02:05:02 +0000
commit6dd32575d4dfdf75d86ba8726850c98bcbcec9e3 (patch)
tree91437f0c47b872ee0a0e3431e971d22fe44b8c75
parentd71d672dc432e262ccbaca5e9afd7341a0722c5d (diff)
downloadchromium_src-6dd32575d4dfdf75d86ba8726850c98bcbcec9e3.zip
chromium_src-6dd32575d4dfdf75d86ba8726850c98bcbcec9e3.tar.gz
chromium_src-6dd32575d4dfdf75d86ba8726850c98bcbcec9e3.tar.bz2
Remark the KeyHandler test as flakey, and make it not run under Valgrind instead.
Review URL: http://codereview.chromium.org/660430 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40481 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/data/valgrind/net_unittests.gtest.txt2
-rw-r--r--net/base/keygen_handler_unittest.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/data/valgrind/net_unittests.gtest.txt b/chrome/test/data/valgrind/net_unittests.gtest.txt
new file mode 100644
index 0000000..30e6221
--- /dev/null
+++ b/chrome/test/data/valgrind/net_unittests.gtest.txt
@@ -0,0 +1,2 @@
+# Very slow under Valgrind.
+KeygenHandlerTest.FLAKY_SmokeTest
diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc
index 9b5ab18..0022c8e 100644
--- a/net/base/keygen_handler_unittest.cc
+++ b/net/base/keygen_handler_unittest.cc
@@ -14,7 +14,7 @@ namespace net {
namespace {
-TEST(KeygenHandlerTest, DISABLED_SmokeTest) {
+TEST(KeygenHandlerTest, FLAKY_SmokeTest) {
KeygenHandler handler(2048, "some challenge");
handler.set_stores_key(false); // Don't leave the key-pair behind
std::string result = handler.GenKeyAndSignChallenge();