summaryrefslogtreecommitdiffstats
path: root/chrome/test/automated_ui_tests
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-04 22:01:37 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-04 22:01:37 +0000
commit1ae27c56dee7b74754d5a6e15a05eddd46263001 (patch)
treeb4905e0104b22e125bf6b04b53e5c83510a96cf4 /chrome/test/automated_ui_tests
parentd8369b60d7dafe4398a90e953aead9e4d93a8f57 (diff)
downloadchromium_src-1ae27c56dee7b74754d5a6e15a05eddd46263001.zip
chromium_src-1ae27c56dee7b74754d5a6e15a05eddd46263001.tar.gz
chromium_src-1ae27c56dee7b74754d5a6e15a05eddd46263001.tar.bz2
Enable two AutomationUITestBase tests on the Mac, and add a bug annotation for one
BUG=45882 TEST=AutomationUITestBase FindInPage and IncognitoWindow run on the Mac. Review URL: http://codereview.chromium.org/2623005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automated_ui_tests')
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_test_test.cc9
1 files changed, 3 insertions, 6 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 5ac393e..318c320 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
@@ -12,12 +12,9 @@
#include "net/base/net_util.h"
#if defined(OS_MACOSX)
-// The window pops up, but doesn't close.
-#define MAYBE_IncognitoWindow DISABLED_IncognitoWindow
-// FindBarTesting not implemented on mac.
-#define MAYBE_FindInPage DISABLED_FindInPage
+// http://crbug.com/45882
+#define MAYBE_FindInPage FAILS_FindInPage
#else // !defined(OS_MACOSX)
-#define MAYBE_IncognitoWindow IncognitoWindow
#define MAYBE_FindInPage FindInPage
#endif
@@ -213,7 +210,7 @@ TEST_F(AutomatedUITestBase, CloseBrowserWindow) {
ASSERT_FALSE(CloseActiveWindow());
}
-TEST_F(AutomatedUITestBase, MAYBE_IncognitoWindow) {
+TEST_F(AutomatedUITestBase, IncognitoWindow) {
int num_browser_windows;
int num_normal_browser_windows;
ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));