Skip to content

GitLab

T
tangled
Commit b0afd3f2 authored by zea@chromium.org's avatar zea@chromium.org
Browse files
Options

Disable crashy geolcoation browser tests 

BUG=129065
TEST=

Review URL: https://chromiumcodereview.appspot.com/10407076

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138146 0039d316-1c4b-4281-b951-d872f2087c98
parent 406f9347
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 10 deletions
chrome/browser/geolocation/geolocation_browsertest.cc
View file @ b0afd3f2
...@@ -389,13 +389,9 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, ...@@ -389,13 +389,9 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
CheckStringValueFromJavascript("1", "geoGetLastError()"); CheckStringValueFromJavascript("1", "geoGetLastError()");
} }
// http://crbug.com/44589. Hangs on Mac, crashes on Windows // http://crbug.com/44589 and http://crbug.com/129065.
#if defined(OS_MACOSX) || defined(OS_WIN) // Hangs on mac, crashes on linux and windows.
#define MAYBE_NoInfobarForSecondTab DISABLED_NoInfobarForSecondTab IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DISABLED_NoInfobarForSecondTab) {
#else
#define MAYBE_NoInfobarForSecondTab NoInfobarForSecondTab
#endif
IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForSecondTab) {
ASSERT_TRUE(Initialize(INITIALIZATION_NONE)); ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
AddGeolocationWatch(true); AddGeolocationWatch(true);
SetInfobarResponse(current_url_, true); SetInfobarResponse(current_url_, true);
...@@ -431,8 +427,9 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForDeniedOrigin) { ...@@ -431,8 +427,9 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForDeniedOrigin) {
CheckStringValueFromJavascript("1", "geoGetLastError()"); CheckStringValueFromJavascript("1", "geoGetLastError()");
} }
// http://crbug.com/100763. Crashes occasionally on XP. // http://crbug.com/100763 and http://crbug.com/129065.
#if defined(OS_WIN) // Crashes occasionally on XP and linux.
#if defined(OS_WIN) || defined(OS_LINUX)
#define MAYBE_NoInfobarForAllowedOrigin DISABLED_NoInfobarForAllowedOrigin #define MAYBE_NoInfobarForAllowedOrigin DISABLED_NoInfobarForAllowedOrigin
#else #else
#define MAYBE_NoInfobarForAllowedOrigin NoInfobarForAllowedOrigin #define MAYBE_NoInfobarForAllowedOrigin NoInfobarForAllowedOrigin
...@@ -450,7 +447,14 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForAllowedOrigin) ...@@ -450,7 +447,14 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForAllowedOrigin)
CheckGeoposition(fake_latitude_, fake_longitude_); CheckGeoposition(fake_latitude_, fake_longitude_);
} }
IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoInfobarForOffTheRecord) { // Crashes on linux.
// http://crbug.com/129065
#if defined(OS_LINUX)
#define MAYBE_NoInfobarForOffTheRecord DISABLED_NoInfobarForOffTheRecord
#else
#define MAYBE_NoInfobarForOffTheRecord NoInfobarForOffTheRecord
#endif
IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForOffTheRecord) {
// First, check infobar will be created for regular profile // First, check infobar will be created for regular profile
ASSERT_TRUE(Initialize(INITIALIZATION_NONE)); ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
AddGeolocationWatch(true); AddGeolocationWatch(true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment