diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 03:32:23 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 03:32:23 +0000 |
| commit | ed7c0cf9448870d10dc99b0ce7999301244f7621 (patch) | |
| tree | efd08c3d5e1de7fefbc08b3bf5c48bf025ab8f43 | |
| parent | 1f2ded2faa1ff9018ee8611367d2f932b974b955 (diff) | |
| download | chromium_src-ed7c0cf9448870d10dc99b0ce7999301244f7621.zip chromium_src-ed7c0cf9448870d10dc99b0ce7999301244f7621.tar.gz chromium_src-ed7c0cf9448870d10dc99b0ce7999301244f7621.tar.bz2 | |
Changed the test to say that it is done after a timer fires and now it
passes on OSX.
Since the resizing of the pop-up will happen after a 0 length timer that
starts during the layout, this timer will occur after that.
BUG=84286
TEST=BrowserActionApiTest.BrowserActionPopup
Review URL: http://codereview.chromium.org/7086016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87152 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/browser_action_apitest.cc | 5 | ||||
| -rw-r--r-- | chrome/test/data/extensions/api_test/browser_action/popup/popup.html | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index 1ee93bc..e9a970b 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -146,12 +146,11 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, } // http://code.google.com/p/chromium/issues/detail?id=70829 -// Only mac is being actively worked on. +// Only mac is okay. #if !defined(OS_MACOSX) #define MAYBE_BrowserActionPopup DISABLED_BrowserActionPopup #else -// http://code.google.com/p/chromium/issues/detail?id=84286 -#define MAYBE_BrowserActionPopup DISABLED_BrowserActionPopup +#define MAYBE_BrowserActionPopup BrowserActionPopup #endif IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, MAYBE_BrowserActionPopup) { ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII( diff --git a/chrome/test/data/extensions/api_test/browser_action/popup/popup.html b/chrome/test/data/extensions/api_test/browser_action/popup/popup.html index ccc5ef7..09e14fe 100644 --- a/chrome/test/data/extensions/api_test/browser_action/popup/popup.html +++ b/chrome/test/data/extensions/api_test/browser_action/popup/popup.html @@ -1,5 +1,10 @@ <head> <script> +function notify_pass() { + // We should be done. Let the test harness know. + chrome.test.notifyPass(); +} + function run_tests() { // Compute the size of the popup. var width = 0; @@ -23,8 +28,9 @@ function run_tests() { localStorage.height = JSON.stringify(height); localStorage.width = JSON.stringify(width); - // We should be done. Let the test harness know. - chrome.test.notifyPass(); + // Allow for the pop-up resize to happen (asynchronously) + // before saying that the test is done. + window.setTimeout(notify_pass, 0); } </script> <style> |