summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 22:16:57 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 22:16:57 +0000
commit1a5a71f11012775e56bf78f223ae1fb0f68f5e90 (patch)
tree0420811f37d0a3118e2b0d93178e8c6b446da09e /chrome/test
parentcd073bdf61a4a9d7819042d0db793d77ecedc7b1 (diff)
downloadchromium_src-1a5a71f11012775e56bf78f223ae1fb0f68f5e90.zip
chromium_src-1a5a71f11012775e56bf78f223ae1fb0f68f5e90.tar.gz
chromium_src-1a5a71f11012775e56bf78f223ae1fb0f68f5e90.tar.bz2
Fix Mac by disabling some UI tests on it.
Not that important anyway, because we don't run automated_ui_tests on Mac yet. TBR=huanr Review URL: http://codereview.chromium.org/193117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_test_test.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_test.cc b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
index b206ef4..b437245d 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
@@ -33,12 +33,15 @@
#define MAYBE_CloseBrowserWindow CloseBrowserWindow
#endif
+// TODO(phajdan.jr): Enable FindInPageTest on Mac.
+#if !defined(OS_MACOSX)
TEST_F(AutomatedUITestBase, FindInPage) {
ASSERT_TRUE(FindInPage());
bool is_visible;
ASSERT_TRUE(active_browser()->IsFindWindowFullyVisible(&is_visible));
EXPECT_TRUE(is_visible);
}
+#endif // !defined(OS_MACOSX)
TEST_F(AutomatedUITestBase, Home) {
FilePath path_prefix(test_data_directory_.AppendASCII("session_history"));
@@ -356,6 +359,8 @@ TEST_F(AutomatedUITestBase, SelectTab) {
ASSERT_EQ(2, active_tab_index);
}
+// TODO(phajdan.jr): Enable ShowBookmarkBar on Mac.
+#if !defined(OS_MACOSX)
TEST_F(AutomatedUITestBase, ShowBookmarkBar) {
ASSERT_TRUE(ShowBookmarkBar());
bool is_visible;
@@ -373,6 +378,7 @@ TEST_F(AutomatedUITestBase, ShowBookmarkBar) {
ASSERT_TRUE(is_visible);
ASSERT_FALSE(is_animating);
}
+#endif // !defined(OS_MACOSX)
TEST_F(AutomatedUITestBase, ShowDownloads) {
ASSERT_TRUE(ShowDownloads());