Skip to content

Commit

Permalink
Revert "Disable ProfileProviderRealCollectionTest.* on ChromeOS"
Browse files Browse the repository at this point in the history
This reverts commit 1a29a1b.

Reason for revert: Cannot reproduce the failures locally and we want
to check if the test is still failing on the bot after submitting
https://chromium-review.googlesource.com/c/chromium/src/+/4322857

Original change's description:
> Disable ProfileProviderRealCollectionTest.* on ChromeOS
>
> Bug: b/271891628
> Change-Id: I4a94dc8cdc284a80ee6fc17c7320bfd94764f633
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4312944
> Reviewed-by: Gabriel Marin <gmx@chromium.org>
> Commit-Queue: Colin Kincaid <ckincaid@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1113634}

Bug: b/271891628
Change-Id: I31151658955bb85b6c78a81b22c7559ff49a0549
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4322877
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Colin Kincaid <ckincaid@chromium.org>
Commit-Queue: Gabriel Marin <gmx@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1117754}
  • Loading branch information
Gabriel Marin authored and Chromium LUCI CQ committed Mar 15, 2023
1 parent ff5a233 commit 1b259b6
Showing 1 changed file with 5 additions and 28 deletions.
33 changes: 5 additions & 28 deletions chrome/browser/metrics/perf/profile_provider_unittest_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,8 @@ class ProfileProviderRealCollectionTest : public testing::Test {
std::unique_ptr<TestProfileProvider> profile_provider_;
};

// Flaky on chromeos: b/271891628
#if BUILDFLAG(IS_CHROMEOS)
#define MAYBE_SuspendDone DISABLED_SuspendDone
#else
#define MAYBE_SuspendDone SuspendDone
#endif
TEST_F(ProfileProviderRealCollectionTest, MAYBE_SuspendDone) {
// Flaky on chromeos: crbug.com/1184119
TEST_F(ProfileProviderRealCollectionTest, SuspendDone) {
// Trigger a resume from suspend.
profile_provider_->SuspendDone(base::Minutes(10));

Expand All @@ -290,13 +285,7 @@ TEST_F(ProfileProviderRealCollectionTest, MAYBE_SuspendDone) {
AssertProfileData(SampledProfile::RESUME_FROM_SUSPEND);
}

// Flaky on chromeos: b/271891628
#if BUILDFLAG(IS_CHROMEOS)
#define MAYBE_SessionRestoreDone DISABLED_SessionRestoreDone
#else
#define MAYBE_SessionRestoreDone SessionRestoreDone
#endif
TEST_F(ProfileProviderRealCollectionTest, MAYBE_SessionRestoreDone) {
TEST_F(ProfileProviderRealCollectionTest, SessionRestoreDone) {
// Restored 10 tabs.
profile_provider_->OnSessionRestoreDone(nullptr, 10);

Expand All @@ -306,13 +295,7 @@ TEST_F(ProfileProviderRealCollectionTest, MAYBE_SessionRestoreDone) {
AssertProfileData(SampledProfile::RESTORE_SESSION);
}

// Flaky on chromeos: b/271891628
#if BUILDFLAG(IS_CHROMEOS)
#define MAYBE_OnJankStarted DISABLED_OnJankStarted
#else
#define MAYBE_OnJankStarted OnJankStarted
#endif
TEST_F(ProfileProviderRealCollectionTest, MAYBE_OnJankStarted) {
TEST_F(ProfileProviderRealCollectionTest, OnJankStarted) {
// Trigger a resume from suspend.
profile_provider_->OnJankStarted();

Expand All @@ -322,13 +305,7 @@ TEST_F(ProfileProviderRealCollectionTest, MAYBE_OnJankStarted) {
AssertProfileData(SampledProfile::JANKY_TASK);
}

// Flaky on chromeos: b/271891628
#if BUILDFLAG(IS_CHROMEOS)
#define MAYBE_OnJankStopped DISABLED_OnJankStopped
#else
#define MAYBE_OnJankStopped OnJankStopped
#endif
TEST_F(ProfileProviderRealCollectionTest, MAYBE_OnJankStopped) {
TEST_F(ProfileProviderRealCollectionTest, OnJankStopped) {
// Override the default collection duration.
auto test_params_override = GetTestCollectionParams();
auto full_collection_duration = kCollectionDuration * 2;
Expand Down

0 comments on commit 1b259b6

Please sign in to comment.