apps/app_shim/app_shim_interactive_uitest_mac.mm - Issue 586443002: mac: Disable AppShimInteractiveTest.Launch

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: apps/app_shim/app_shim_interactive_uitest_mac.mm

Issue 586443002: mac: Disable AppShimInteractiveTest.Launch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: apps/app_shim/app_shim_interactive_uitest_mac.mm

diff --git a/apps/app_shim/app_shim_interactive_uitest_mac.mm b/apps/app_shim/app_shim_interactive_uitest_mac.mm

index f019c8e14c39f993a2ebfcc61a8a79acbd56102e..580622591744224f75f5ebc145da2670214c5563 100644

--- a/apps/app_shim/app_shim_interactive_uitest_mac.mm

+++ b/apps/app_shim/app_shim_interactive_uitest_mac.mm

@@ -214,7 +214,8 @@ bool HasAppShimHost(Profile* profile, const std::string& app_id) {

namespace apps {

// Shims require static libraries http://crbug.com/386024.

-#if defined(COMPONENT_BUILD)

+// This test is flaky on OSX. http://crbug.com/415422

+#if defined(COMPONENT_BUILD) || defined(OS_MACOSX)

#define MAYBE_Launch DISABLED_Launch

#define MAYBE_RebuildShim DISABLED_RebuildShim

#else

« no previous file with comments | « no previous file | no next file » | no next file with comments »