Commit 4915ecc8 authored by Justin Cohen's avatar Justin Cohen Committed by Commit Bot

Reland "[ios] Disable failing tests for Xcode 11 beta 6."

This reverts commit 774d23c5.

Reason for revert: Moved webState timeout to correct test.

Original change's description:
> Revert "[ios] Disable failing tests for Xcode 11 beta 6."
> 
> This reverts commit 0ba4c00b.
> 
> Reason for revert: webState timeout is in the wrong place, fixing via
> revert.
> 
> Original change's description:
> > [ios] Disable failing tests for Xcode 11 beta 6.
> > 
> > Increases a webState timeout, disables a request desktop and two
> > share button tests.
> > 
> > Bug: 995797, 996541, 990186, 996544
> > Change-Id: I07c8dd52d0bb13c6c805ef35b2c727ec3deb84bb
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1762331
> > Commit-Queue: Justin Cohen <justincohen@chromium.org>
> > Reviewed-by: Rohit Rao <rohitrao@chromium.org>
> > Auto-Submit: Justin Cohen <justincohen@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#689326}
> 
> TBR=rohitrao@chromium.org,justincohen@chromium.org
> 
> Change-Id: I0fb517a23c012fae88df440adac061901d1c8cdc
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 995797, 996541, 990186, 996544
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1765494
> Reviewed-by: Justin Cohen <justincohen@chromium.org>
> Commit-Queue: Justin Cohen <justincohen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#689476}

TBR=rohitrao@chromium.org,justincohen@chromium.org

Change-Id: I1e0b311ed2533e8311fe86ba2c290b6794c02930
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 995797, 996541, 990186, 996544
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1763237Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689480}
parent dd78c40c
......@@ -103,6 +103,11 @@ id<GREYMatcher> ShareMenuCollectionView() {
}
- (void)testActivityServiceControllerIsDisabled {
// TODO(crbug.com/996541) Starting in Xcode 11 beta 6, the share button does
// not appear (even with a delay) flakily.
if (@available(iOS 13, *))
EARL_GREY_TEST_DISABLED(@"Test disabled on iOS13.");
// Open an un-shareable page.
GURL kURL("chrome://version");
[ChromeEarlGrey loadURL:kURL];
......
......@@ -96,6 +96,10 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
// Voice search is not enabled on the bots, so the voice search button is
// not tested here.
- (void)testTrailingButton {
// TODO(crbug.com/996541) Starting in Xcode 11 beta 6, the share button does
// not appear (even with a delay) flakily.
if (@available(iOS 13, *))
EARL_GREY_TEST_DISABLED(@"Test disabled on iOS13.");
[self openPage1];
if ([ChromeEarlGrey isCompactWidth]) {
......
......@@ -141,6 +141,10 @@ class UserAgentResponseProvider : public web::DataResponseProvider {
// Tests that requesting desktop site of a page works and going back re-opens
// mobile version of the page.
- (void)testRequestDesktopSiteGoBackToMobile {
// TODO(crbug.com/990186): Re-enable this test.
if ([ChromeEarlGrey isSlimNavigationManagerEnabled])
EARL_GREY_TEST_DISABLED(@"Test disabled on SlimNavigationManager.");
std::unique_ptr<web::DataResponseProvider> provider(
new UserAgentResponseProvider());
web::test::SetUpHttpServer(std::move(provider));
......
......@@ -515,7 +515,10 @@ TEST_P(WebStateTest, CallLoadURLWithParamsDuringSessionRestore) {
EXPECT_TRUE(navigation_manager->CanGoForward());
// Now wait until the last committed item is fully loaded.
EXPECT_TRUE(WaitUntilConditionOrTimeout(kWaitForPageLoadTimeout, ^{
// TODO(crbug.com/996544) On Xcode 11 beta 6 this became very slow. This
// appears to only affect simulator, and will hopefully be fixed in a future
// Xcode release. Revert this to |kWaitForPageLoadTimeout| alone when fixed.
EXPECT_TRUE(WaitUntilConditionOrTimeout(kWaitForPageLoadTimeout * 5, ^{
return web_state_ptr->GetLastCommittedURL() == url;
}));
}
......
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