diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 09:11:50 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 09:11:50 +0000 |
commit | 5a0d44252b20556142f45205669035f5622e87ec (patch) | |
tree | 8a60ceea056e261b8b74a6b2c4a0ac97f58de480 /chrome/app/chrome_main_uitest.cc | |
parent | b822203129e5c2d113118fc1897c85f57546b92c (diff) | |
download | chromium_src-5a0d44252b20556142f45205669035f5622e87ec.zip chromium_src-5a0d44252b20556142f45205669035f5622e87ec.tar.gz chromium_src-5a0d44252b20556142f45205669035f5622e87ec.tar.bz2 |
GTTF: Remove flaky and/or useless UI tests.
An example of a flake:
ChromeMainTest.AppLaunch:
c:\b\slave\win\build\src\chrome\app\chrome_main_uitest.cc(28):
error: Value of: UITest::GetBrowserProcessCount()
Actual: 3
Expected: 2
BUG=none
TEST=ui_tests
Review URL: http://codereview.chromium.org/3796009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main_uitest.cc')
-rw-r--r-- | chrome/app/chrome_main_uitest.cc | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc index 65df2c2..8b77fb7 100644 --- a/chrome/app/chrome_main_uitest.cc +++ b/chrome/app/chrome_main_uitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,35 +10,6 @@ typedef UITest ChromeMainTest; -// Launch the app, then close the app. -TEST_F(ChromeMainTest, AppLaunch) { - // If we make it here at all, we've succeeded in retrieving the app window - // in UITest::SetUp()--otherwise we'd fail with an exception in SetUp(). - - if (UITest::in_process_renderer()) { - EXPECT_EQ(1, UITest::GetBrowserProcessCount()); - } else { -#if defined(OS_LINUX) - // On Linux we'll have four processes: browser, renderer, zygote and - // sandbox helper. - EXPECT_EQ(4, UITest::GetBrowserProcessCount()); -#else - // We should have two instances of the browser process alive - - // one is the Browser and the other is the Renderer. - EXPECT_EQ(2, UITest::GetBrowserProcessCount()); -#endif - } -} - -// Make sure that the testing interface is there and giving reasonable answers. -TEST_F(ChromeMainTest, AppTestingInterface) { - int window_count = 0; - EXPECT_TRUE(automation()->GetBrowserWindowCount(&window_count)); - EXPECT_EQ(1, window_count); - - EXPECT_EQ(1, GetTabCount()); -} - #if !defined(OS_MACOSX) // These tests don't apply to the Mac version; see // LaunchAnotherBrowserBlockUntilClosed for details. @@ -64,5 +35,4 @@ TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) { ASSERT_TRUE(automation()->IsURLDisplayed(net::FilePathToFileURL(test_file))); } - #endif // !OS_MACOSX |