diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-20 00:45:48 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-20 00:45:48 +0000 |
| commit | 5c292e2238cbcb8d1bd5f8f604f5f430d0de77d2 (patch) | |
| tree | 11dceddc5729d6f540cf97f487a311103efd0c34 /chrome/browser/tab_restore_uitest.cc | |
| parent | 589061000c6ba4ec00c0cd06edd240e07a91f072 (diff) | |
| download | chromium_src-5c292e2238cbcb8d1bd5f8f604f5f430d0de77d2.zip chromium_src-5c292e2238cbcb8d1bd5f8f604f5f430d0de77d2.tar.gz chromium_src-5c292e2238cbcb8d1bd5f8f604f5f430d0de77d2.tar.bz2 | |
Disable some flaky UI tests in windows Debug.
BUG=14774
TEST=no
Review URL: http://codereview.chromium.org/140032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 5535124..0cb8f829 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -20,6 +20,13 @@ #include "net/base/net_util.h" #include "net/url_request/url_request_unittest.h" +// http://code.google.com/p/chromium/issues/detail?id=14774 +#if defined(OS_WIN) && !defined(NDEBUG) +#define MAYBE_BasicRestoreFromClosedWindow DISABLED_BasicRestoreFromClosedWindow +#else +#define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow +#endif + class TabRestoreUITest : public UITest { public: TabRestoreUITest() : UITest() { @@ -235,7 +242,7 @@ TEST_F(TabRestoreUITest, DISABLED_RestoreToDifferentWindow) { // Close a tab, open a new window, close the first window, then restore the // tab. It should be in a new window. -TEST_F(TabRestoreUITest, BasicRestoreFromClosedWindow) { +TEST_F(TabRestoreUITest, MAYBE_BasicRestoreFromClosedWindow) { scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); CheckActiveWindow(browser_proxy.get()); |