Commit 3784517e authored by baxley's avatar baxley Committed by Commit bot

Disable EarlGrey web shell tests that fail on device.

7 tests, at least some of which use context menus, are
failing when run on devices.

BUG=675015

Review-Url: https://codereview.chromium.org/2583683004
Cr-Commit-Position: refs/heads/master@{#439179}
parent 7c3dfc3e
...@@ -33,8 +33,14 @@ using testing::elementToDismissContextMenu; ...@@ -33,8 +33,14 @@ using testing::elementToDismissContextMenu;
@implementation ContextMenuTestCase @implementation ContextMenuTestCase
// TODO(crbug.com/675015): Re-enable this test on device.
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testContextMenu testContextMenu
#else
#define MAYBE_testContextMenu FLAKY_testContextMenu
#endif
// Tests context menu appears on a regular link. // Tests context menu appears on a regular link.
- (void)testContextMenu { - (void)MAYBE_testContextMenu {
// Create map of canned responses and set up the test HTML server. // Create map of canned responses and set up the test HTML server.
std::map<GURL, std::string> responses; std::map<GURL, std::string> responses;
GURL initialURL = web::test::HttpServer::MakeUrl("http://contextMenuOpen"); GURL initialURL = web::test::HttpServer::MakeUrl("http://contextMenuOpen");
...@@ -69,8 +75,16 @@ using testing::elementToDismissContextMenu; ...@@ -69,8 +75,16 @@ using testing::elementToDismissContextMenu;
[[EarlGrey selectElementWithMatcher:copyItem] assertWithMatcher:grey_nil()]; [[EarlGrey selectElementWithMatcher:copyItem] assertWithMatcher:grey_nil()];
} }
// TODO(crbug.com/675015): Re-enable this test on device.
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testContextMenuWebkitTouchCalloutNone \
testContextMenuWebkitTouchCalloutNone
#else
#define MAYBE_testContextMenuWebkitTouchCalloutNone \
FLAKY_testContextMenuWebkitTouchCalloutNone
#endif
// Tests context menu on element that has WebkitTouchCallout set to none. // Tests context menu on element that has WebkitTouchCallout set to none.
- (void)testContextMenuWebkitTouchCalloutNone { - (void)MAYBE_testContextMenuWebkitTouchCalloutNone {
// Create map of canned responses and set up the test HTML server. // Create map of canned responses and set up the test HTML server.
std::map<GURL, std::string> responses; std::map<GURL, std::string> responses;
GURL initialURL = GURL initialURL =
...@@ -98,9 +112,17 @@ using testing::elementToDismissContextMenu; ...@@ -98,9 +112,17 @@ using testing::elementToDismissContextMenu;
[[EarlGrey selectElementWithMatcher:copyItem] assertWithMatcher:grey_nil()]; [[EarlGrey selectElementWithMatcher:copyItem] assertWithMatcher:grey_nil()];
} }
// TODO(crbug.com/675015): Re-enable this test on device.
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testContextMenuWebkitTouchCalloutNoneFromAncestor \
testContextMenuWebkitTouchCalloutNoneFromAncestor
#else
#define MAYBE_testContextMenuWebkitTouchCalloutNoneFromAncestor \
FLAKY_testContextMenuWebkitTouchCalloutNoneFromAncestor
#endif
// Tests context menu on element that has WebkitTouchCallout set to none from an // Tests context menu on element that has WebkitTouchCallout set to none from an
// ancestor. // ancestor.
- (void)testContextMenuWebkitTouchCalloutNoneFromAncestor { - (void)MAYBE_testContextMenuWebkitTouchCalloutNoneFromAncestor {
// Create map of canned responses and set up the test HTML server. // Create map of canned responses and set up the test HTML server.
std::map<GURL, std::string> responses; std::map<GURL, std::string> responses;
GURL initialURL = GURL initialURL =
...@@ -129,9 +151,17 @@ using testing::elementToDismissContextMenu; ...@@ -129,9 +151,17 @@ using testing::elementToDismissContextMenu;
[[EarlGrey selectElementWithMatcher:copyItem] assertWithMatcher:grey_nil()]; [[EarlGrey selectElementWithMatcher:copyItem] assertWithMatcher:grey_nil()];
} }
// TODO(crbug.com/675015): Re-enable this test on device.
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testContextMenuWebkitTouchCalloutOverride \
testContextMenuWebkitTouchCalloutOverride
#else
#define MAYBE_testContextMenuWebkitTouchCalloutOverride \
FLAKY_testContextMenuWebkitTouchCalloutOverride
#endif
// Tests context menu on element that has WebkitTouchCallout set to none from an // Tests context menu on element that has WebkitTouchCallout set to none from an
// ancestor and overridden. // ancestor and overridden.
- (void)testContextMenuWebkitTouchCalloutOverride { - (void)MAYBE_testContextMenuWebkitTouchCalloutOverride {
// Create map of canned responses and set up the test HTML server. // Create map of canned responses and set up the test HTML server.
std::map<GURL, std::string> responses; std::map<GURL, std::string> responses;
GURL initialURL = GURL initialURL =
......
...@@ -44,8 +44,14 @@ ...@@ -44,8 +44,14 @@
assertWithMatcher:grey_notNil()]; assertWithMatcher:grey_notNil()];
} }
// TODO(crbug.com/675015): Re-enable this test on device.
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testNavigationBackAndForward testNavigationBackAndForward
#else
#define MAYBE_testNavigationBackAndForward FLAKY_testNavigationBackAndForward
#endif
// Tests the back and forward button after entering two URLs. // Tests the back and forward button after entering two URLs.
- (void)testNavigationBackAndForward { - (void)MAYBE_testNavigationBackAndForward {
// Create map of canned responses and set up the test HTML server. // Create map of canned responses and set up the test HTML server.
std::map<GURL, std::string> responses; std::map<GURL, std::string> responses;
const GURL URL1 = web::test::HttpServer::MakeUrl("http://firstURL"); const GURL URL1 = web::test::HttpServer::MakeUrl("http://firstURL");
...@@ -85,8 +91,16 @@ ...@@ -85,8 +91,16 @@
assertWithMatcher:grey_notNil()]; assertWithMatcher:grey_notNil()];
} }
// TODO(crbug.com/675015): Re-enable this test on device.
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testNavigationBackAndForwardAfterFragmentLink \
testNavigationBackAndForwardAfterFragmentLink
#else
#define MAYBE_testNavigationBackAndForwardAfterFragmentLink \
FLAKY_testNavigationBackAndForwardAfterFragmentLink
#endif
// Tests back and forward navigation where a fragment link is tapped. // Tests back and forward navigation where a fragment link is tapped.
- (void)testNavigationBackAndForwardAfterFragmentLink { - (void)MAYBE_testNavigationBackAndForwardAfterFragmentLink {
// Create map of canned responses and set up the test HTML server. // Create map of canned responses and set up the test HTML server.
std::map<GURL, std::string> responses; std::map<GURL, std::string> responses;
const GURL URL1 = web::test::HttpServer::MakeUrl("http://fragmentLink"); const GURL URL1 = web::test::HttpServer::MakeUrl("http://fragmentLink");
......
...@@ -57,9 +57,15 @@ using web::test::HttpServer; ...@@ -57,9 +57,15 @@ using web::test::HttpServer;
@implementation PageStateTestCase @implementation PageStateTestCase
// TODO(crbug.com/675015): Re-enable this test on device.
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testScrollPositionRestoring testScrollPositionRestoring
#else
#define MAYBE_testScrollPositionRestoring FLAKY_testScrollPositionRestoring
#endif
// Tests that page scroll position of a page is restored upon returning to the // Tests that page scroll position of a page is restored upon returning to the
// page via the back/forward buttons. // page via the back/forward buttons.
- (void)testScrollPositionRestoring { - (void)MAYBE_testScrollPositionRestoring {
// TODO(crbug.com/670700): Re-enable this test. // TODO(crbug.com/670700): Re-enable this test.
if (!base::ios::IsRunningOnIOS10OrLater()) { if (!base::ios::IsRunningOnIOS10OrLater()) {
EARL_GREY_TEST_DISABLED(@"Test disabled on pre-iOS 10"); EARL_GREY_TEST_DISABLED(@"Test disabled on pre-iOS 10");
......
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