Skip to content

GitLab

T
tangled
Commit 20360876 authored by oshima@chromium.org's avatar oshima@chromium.org
Browse files
Options

AURA: Disable failing browser tests so that we can enable browser_tests on build/try bots. 

BUG=102855, 105177, 105129, 105174, 105173, 103499.
TEST=browser_tests should pass on aura


Review URL: http://codereview.chromium.org/8660003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111297 0039d316-1c4b-4281-b951-d872f2087c98
parent 3a2033aa
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 5 deletions
chrome/browser/chromeos/panels/panel_browsertest.cc
View file @ 20360876
...@@ -75,8 +75,15 @@ IN_PROC_BROWSER_TEST_F(PanelTest, PanelOpenSmall) { ...@@ -75,8 +75,15 @@ IN_PROC_BROWSER_TEST_F(PanelTest, PanelOpenSmall) {
#endif #endif
} }
#if defined(USE_AURA)
// crbug.com/105129.
#define MAYBE_PanelOpenLarge DISABLED_PanelOpenLarge
#else
#define MAYBE_PanelOpenLarge PanelOpenLarge
#endif
// Large popups should open as new tab. // Large popups should open as new tab.
IN_PROC_BROWSER_TEST_F(PanelTest, PanelOpenLarge) { IN_PROC_BROWSER_TEST_F(PanelTest, MAYBE_PanelOpenLarge) {
const std::string HTML = const std::string HTML =
"<html><head><title>PanelOpen</title></head>" "<html><head><title>PanelOpen</title></head>"
"<body onload='window.setTimeout(run_tests, 0)'>" "<body onload='window.setTimeout(run_tests, 0)'>"
......
chrome/browser/extensions/extension_get_views_apitest.cc
View file @ 20360876
...@@ -6,7 +6,14 @@ ...@@ -6,7 +6,14 @@
#include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViews) { #if defined(USE_AURA)
// crbug.com/105177.
#define MAYBE_GetViews DISABLED_GetViews
#else
#define MAYBE_GetViews GetViews
#endif
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViews) {
// TODO(finnur): Remove once infobars are no longer experimental (bug 39511). // TODO(finnur): Remove once infobars are no longer experimental (bug 39511).
CommandLine::ForCurrentProcess()->AppendSwitch( CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableExperimentalExtensionApis); switches::kEnableExperimentalExtensionApis);
......
chrome/browser/extensions/extension_tabs_test.cc
View file @ 20360876
...@@ -255,7 +255,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, ...@@ -255,7 +255,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest,
extension_tabs_module_constants::kIncognitoModeIsDisabled)); extension_tabs_module_constants::kIncognitoModeIsDisabled));
} }
IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, InvalidUpdateWindowState) { #if defined(USE_AURA)
// crbug.com/105173.
#define MAYBE_InvalidUpdateWindowState DISABLED_InvalidUpdateWindowState
#else
#define MAYBE_InvalidUpdateWindowState InvalidUpdateWindowState
#endif
IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, MAYBE_InvalidUpdateWindowState) {
static const char kArgsMinimizedWithFocus[] = static const char kArgsMinimizedWithFocus[] =
"[%u, {\"state\": \"minimized\", \"focused\": true}]"; "[%u, {\"state\": \"minimized\", \"focused\": true}]";
static const char kArgsMaximizedWithoutFocus[] = static const char kArgsMaximizedWithoutFocus[] =
......
content/renderer/render_view_browsertest.cc
View file @ 20360876
...@@ -521,9 +521,16 @@ TEST_F(RenderViewImplTest, OnSetTextDirection) { ...@@ -521,9 +521,16 @@ TEST_F(RenderViewImplTest, OnSetTextDirection) {
} }
} }
#if defined(USE_AURA)
// crbug.com/103499.
#define MAYBE_OnHandleKeyboardEvent DISABLED_OnHandleKeyboardEvent
#else
#define MAYBE_OnHandleKeyboardEvent OnHandleKeyboardEvent
#endif
// Test that we can receive correct DOM events when we send input events // Test that we can receive correct DOM events when we send input events
// through the RenderWidget::OnHandleInputEvent() function. // through the RenderWidget::OnHandleInputEvent() function.
TEST_F(RenderViewImplTest, OnHandleKeyboardEvent) { TEST_F(RenderViewImplTest, MAYBE_OnHandleKeyboardEvent) {
#if !defined(OS_MACOSX) #if !defined(OS_MACOSX)
// Load an HTML page consisting of one <input> element and three // Load an HTML page consisting of one <input> element and three
// contentediable <div> elements. // contentediable <div> elements.
...@@ -667,11 +674,18 @@ TEST_F(RenderViewImplTest, OnHandleKeyboardEvent) { ...@@ -667,11 +674,18 @@ TEST_F(RenderViewImplTest, OnHandleKeyboardEvent) {
#endif #endif
} }
#if defined(USE_AURA)
// crbug.com/103499.
#define MAYBE_InsertCharacters DISABLED_InsertCharacters
#else
#define MAYBE_InsertCharacters InsertCharacters
#endif
// Test that our EditorClientImpl class can insert characters when we send // Test that our EditorClientImpl class can insert characters when we send
// keyboard events through the RenderWidget::OnHandleInputEvent() function. // keyboard events through the RenderWidget::OnHandleInputEvent() function.
// This test is for preventing regressions caused only when we use non-US // This test is for preventing regressions caused only when we use non-US
// keyboards, such as Issue 10846. // keyboards, such as Issue 10846.
TEST_F(RenderViewImplTest, InsertCharacters) { TEST_F(RenderViewImplTest, MAYBE_InsertCharacters) {
#if !defined(OS_MACOSX) #if !defined(OS_MACOSX)
static const struct { static const struct {
MockKeyboard::Layout layout; MockKeyboard::Layout layout;
......
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