diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-29 16:45:27 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-29 16:45:27 +0000 |
| commit | c670c24fe8d690af619c84cbf7ef3d02e6da3043 (patch) | |
| tree | 6396b5c43d5d10391975f7de165def06642a8705 | |
| parent | f3912f50672392776237bb9e5b782d26d7f4fc5b (diff) | |
| download | chromium_src-c670c24fe8d690af619c84cbf7ef3d02e6da3043.zip chromium_src-c670c24fe8d690af619c84cbf7ef3d02e6da3043.tar.gz chromium_src-c670c24fe8d690af619c84cbf7ef3d02e6da3043.tar.bz2 | |
reenable overrides test
- The failure was happening because of my change to use api_test.js in the test. Because of that, there were now two calls to chrome.test.pass(), and I was asserting that there had been only one. This was only failing under Release, presumably because it wound up getting both pass events in the single event loop (a timing issue).
BUG=none
TEST=browser_tests.exe --gtest_filter=ExtensionApiTest.Overrides
Review URL: http://codereview.chromium.org/181012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24856 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_override_apitest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc index c9228b0..8d313f8 100644 --- a/chrome/browser/extensions/extension_override_apitest.cc +++ b/chrome/browser/extensions/extension_override_apitest.cc @@ -4,8 +4,14 @@ #include "chrome/browser/extensions/extension_apitest.h" -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Overrides) { - ASSERT_TRUE(RunExtensionTest("override1")) << message_; // new tab +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Overrides) { + // The first pass response is the creation of a new tab. + ASSERT_TRUE(RunExtensionTest("override1")) << message_; + + // The overridden new tab page also sends a pass response. + WaitForPassFail(); + + // There should be no additional pass/fail responses. EXPECT_EQ(results_.size(), 0U); // TODO(erikkay) load a second override and verify behavior, then unload |