diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 02:36:53 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 02:36:53 +0000 |
| commit | 5402a373996ce3910242fb46c29ddfe2b157d31a (patch) | |
| tree | 3c080cb4cef88b47fadd16ac966063e263237b8c /chrome | |
| parent | 7ae82bf950b52201b5af7b4985dd507e7af92302 (diff) | |
| download | chromium_src-5402a373996ce3910242fb46c29ddfe2b157d31a.zip chromium_src-5402a373996ce3910242fb46c29ddfe2b157d31a.tar.gz chromium_src-5402a373996ce3910242fb46c29ddfe2b157d31a.tar.bz2 | |
Disablging failing ui tests: RestoreWindow and RestoreWindowAndTab
TBR=sky@chromium.org
BUG=48911
TEST=none
Review URL: http://codereview.chromium.org/2895012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index f471b5b..f40178e 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -28,6 +28,15 @@ #define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow #endif +// http://crbug.com/ +#if defined(OS_CHROMEOS) && !defined(NDEBUG) +#define MAYBE_RestoreWindowAndTab DISABLED_RestoreWindowAndTab +#define MAYBE_RestoreWindow DISABLED_RestoreWindow +#else +#define MAYBE_RestoreWindowAndTab RestoreWindowAndTab +#define MAYBE_RestoreWindow RestoreWindow +#endif + class TabRestoreUITest : public UITest { public: TabRestoreUITest() : UITest() { @@ -335,7 +344,7 @@ TEST_F(TabRestoreUITest, DontLoadRestoredTab) { // Open a window with multiple tabs, close a tab, then close the window. // Restore both and make sure the tab goes back into the window. -TEST_F(TabRestoreUITest, RestoreWindowAndTab) { +TEST_F(TabRestoreUITest, MAYBE_RestoreWindowAndTab) { scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); CheckActiveWindow(browser_proxy.get()); @@ -548,7 +557,7 @@ TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) { EXPECT_EQ(http_url2, GetActiveTabURL()); } -TEST_F(TabRestoreUITest, RestoreWindow) { +TEST_F(TabRestoreUITest, MAYBE_RestoreWindow) { // Create a new window. int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); |