Commit 3737b2d9 authored by Gregory Chatzinoff's avatar Gregory Chatzinoff Committed by Commit Bot

Reenable FeatureEngagement EGTest.

Reenable the FeatureEngagement testBadgedREadingListFeatureShouldShow
test by increasing the timeout.

Bug: 789943
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Iace3e1e7c3beb1930ef7c85cc1184ac27665fcff
Reviewed-on: https://chromium-review.googlesource.com/812218Reviewed-by: default avataredchin <edchin@chromium.org>
Commit-Queue: Gregory Chatzinoff <gchatz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522222}
parent 7c498e59
...@@ -29,6 +29,9 @@ namespace { ...@@ -29,6 +29,9 @@ namespace {
// Help feature to be shown. // Help feature to be shown.
const int kMinChromeOpensRequired = 5; const int kMinChromeOpensRequired = 5;
// The timeout for the load of the feature engagement tracker.
const NSTimeInterval kWaitForTrackerLoadTimeout = 5.0;
// Matcher for the Reading List Text Badge. // Matcher for the Reading List Text Badge.
id<GREYMatcher> ReadingListTextBadge() { id<GREYMatcher> ReadingListTextBadge() {
return grey_accessibilityID(@"kReadingListTextBadgeAccessibilityIdentifier"); return grey_accessibilityID(@"kReadingListTextBadgeAccessibilityIdentifier");
...@@ -51,12 +54,12 @@ void LoadFeatureEngagementTracker() { ...@@ -51,12 +54,12 @@ void LoadFeatureEngagementTracker() {
feature_engagement::Tracker* tracker = feature_engagement::Tracker* tracker =
feature_engagement::TrackerFactory::GetForBrowserState(browserState); feature_engagement::TrackerFactory::GetForBrowserState(browserState);
GREYAssert(testing::WaitUntilConditionOrTimeout( GREYAssert(
testing::kWaitForFileOperationTimeout, testing::WaitUntilConditionOrTimeout(kWaitForTrackerLoadTimeout,
^{ ^{
return tracker->IsInitialized(); return tracker->IsInitialized();
}), }),
@"Engagement Tracker did not load before timeout."); @"Engagement Tracker did not load before timeout.");
} }
// Enables the Badged Reading List help to be triggered for |feature_list|. // Enables the Badged Reading List help to be triggered for |feature_list|.
...@@ -89,9 +92,7 @@ void EnableBadgedReadingListTriggering( ...@@ -89,9 +92,7 @@ void EnableBadgedReadingListTriggering(
// Verifies that the Badged Reading List feature shows when triggering // Verifies that the Badged Reading List feature shows when triggering
// conditions are met. // conditions are met.
// TODO(crbug.com/789943): This test is flaky on devices. Reenable it once it is - (void)testBadgedReadingListFeatureShouldShow {
// fixed.
- (void)FLAKY_testBadgedReadingListFeatureShouldShow {
base::test::ScopedFeatureList scoped_feature_list; base::test::ScopedFeatureList scoped_feature_list;
EnableBadgedReadingListTriggering(scoped_feature_list); EnableBadgedReadingListTriggering(scoped_feature_list);
......
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