summaryrefslogtreecommitdiffstats
path: root/chrome/browser/crash_recovery_browsertest.cc
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 20:44:10 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 20:44:10 +0000
commit6c0c202dde2d8f5bbc0a7c857adaff6b3c29b6c4 (patch)
tree441d218d53f84df0da6aa42b98a2c6dcebab2bf9 /chrome/browser/crash_recovery_browsertest.cc
parent563007b6b78a16e645f73388d115630d9cd57c8d (diff)
downloadchromium_src-6c0c202dde2d8f5bbc0a7c857adaff6b3c29b6c4.zip
chromium_src-6c0c202dde2d8f5bbc0a7c857adaff6b3c29b6c4.tar.gz
chromium_src-6c0c202dde2d8f5bbc0a7c857adaff6b3c29b6c4.tar.bz2
Mark the tests as disabled on mac with a bug to revisit, this should allow browser_tests to run on the mac.
BUG=29331 TEST=none Review URL: http://codereview.chromium.org/466021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/crash_recovery_browsertest.cc')
-rw-r--r--chrome/browser/crash_recovery_browsertest.cc14
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index e97b573..96c4c39 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -57,8 +57,18 @@ void SimulateRendererCrash(Browser* browser) {
class CrashRecoveryBrowserTest : public InProcessBrowserTest {
};
+// http://crbug.com/29331 - Causes an OS crash dialog in release mode, needs to
+// be fixed before it can be enabled to not cause the bots issues.
+#if defined(OS_MACOSX)
+#define MAYBE_Reload DISABLED_Reload
+#define MAYBE_LoadInNewTab DISABLED_LoadInNewTab
+#else
+#define MAYBE_Reload Reload
+#define MAYBE_LoadInNewTab LoadInNewTab
+#endif
+
// Test that reload works after a crash.
-IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) {
+IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_Reload) {
// The title of the active tab should change each time this URL is loaded.
GURL url(
"data:text/html,<script>document.title=new Date().valueOf()</script>");
@@ -81,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) {
// There was an earlier bug (1270510) in process-per-site in which the max page
// ID of the RenderProcessHost was stale, so the NavigationEntry in the new tab
// was not committed. This prevents regression of that bug.
-IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
+IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_LoadInNewTab) {
ui_test_utils::NavigateToURL(browser(),
ui_test_utils::GetTestUrl(L".", L"title2.html"));