Commit a430668a authored by Haiyang Pan's avatar Haiyang Pan Committed by Commit Bot

Reland "[ios][eg2] Disable all EG2 tests from SigninInteractionControllerTestCase."

This reverts commit 16775142.

Reason for revert: Quite a few SigninInteractionControllerTestCase tests are failing on https://ci.chromium.org/p/chromium/builders/ci/ios-simulator-noncq and might caused the timeout on swarming task.
See https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8890361013331611952/+/steps/ios_chrome_ui_eg2tests_module__iPhone_X_iOS_13.1__shard_1__with_patch__on_Mac-10.14.6/0/stdout

Original change's description:
> Revert "[ios][eg2] Disable all EG2 tests from SigninInteractionControllerTestCase."
> 
> This reverts commit db9b2ce6.
> 
> Reason for revert: Tests now pass
> 
> Original change's description:
> > [ios][eg2] Disable all EG2 tests from SigninInteractionControllerTestCase.
> > 
> > TBR=jlebel@chromium.org
> > 
> > Bug: 1037676,1036840
> > Change-Id: I552d7cec1cab40b5ef9dae9271bb956a625fd71f
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1981141
> > Reviewed-by: Eugene But <eugenebut@chromium.org>
> > Commit-Queue: Eugene But <eugenebut@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#727312}
> 
> TBR=eugenebut@chromium.org,jlebel@google.com
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Bug: 1037676, 1036840
> Change-Id: Ie9c4b650360072c3e916e78d122ae331f55f424c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2015408
> Reviewed-by: Eugene But <eugenebut@chromium.org>
> Reviewed-by: Jérôme Lebel <jlebel@chromium.org>
> Commit-Queue: Eugene But <eugenebut@chromium.org>
> Auto-Submit: Eugene But <eugenebut@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#734642}

TBR=eugenebut@chromium.org,jlebel@chromium.org,jlebel@google.com

Change-Id: I61d15f1d257bb9836a4ac7257276abad579adeeb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1037676, 1036840
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019936Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#735057}
parent f3835c95
...@@ -131,6 +131,13 @@ void ChooseImportOrKeepDataSepareteDialog(id<GREYMatcher> choiceButtonMatcher) { ...@@ -131,6 +131,13 @@ void ChooseImportOrKeepDataSepareteDialog(id<GREYMatcher> choiceButtonMatcher) {
@implementation SigninInteractionControllerTestCase @implementation SigninInteractionControllerTestCase
#if defined(CHROME_EARL_GREY_2)
+ (NSArray*)testInvocations {
// TODO(crbug.com/1037676): Fix and enable the tests for EG2.
return @[];
}
#endif
- (void)setUp { - (void)setUp {
[super setUp]; [super setUp];
// Remove closed tab history to make sure the sign-in promo is always visible // Remove closed tab history to make sure the sign-in promo is always visible
......
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