diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 19:57:01 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 19:57:01 +0000 |
| commit | 400cc493fc8e0bc6205381426afea8011b1b4041 (patch) | |
| tree | e46fa9cdd618a4b1df90ea1d44131aa189d4e6b1 /chrome/test/nacl | |
| parent | 6de627262d774f26056ea431a9ce4eacdbc05be0 (diff) | |
| download | chromium_src-400cc493fc8e0bc6205381426afea8011b1b4041.zip chromium_src-400cc493fc8e0bc6205381426afea8011b1b4041.tar.gz chromium_src-400cc493fc8e0bc6205381426afea8011b1b4041.tar.bz2 | |
Make 2 NaCl integration tests not flaky
BUG=40669,41007
Review URL: http://codereview.chromium.org/1605025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
| -rw-r--r-- | chrome/test/nacl/nacl_test.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc index ef12dc1..8f86d70 100644 --- a/chrome/test/nacl/nacl_test.cc +++ b/chrome/test/nacl/nacl_test.cc @@ -117,8 +117,7 @@ void NaClTest::TearDown() { UITest::TearDown(); } -// See bug http://code.google.com/p/chromium/issues/detail?id=41007 -TEST_F(NaClTest, FLAKY_ServerTest) { +TEST_F(NaClTest, ServerTest) { FilePath test_file(kServerHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } @@ -153,9 +152,7 @@ TEST_F(NaClTest, SrpcNrdXferTest) { RunTest(test_file, action_max_timeout_ms()); } -// The test seems to be flaky. -// http://code.google.com/p/chromium/issues/detail?id=40669 -TEST_F(NaClTest, FLAKY_NpapiHwTest) { +TEST_F(NaClTest, NpapiHwTest) { FilePath test_file(kNpapiHwHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } |