Skip to content

Commit

Permalink
[Branch Sheriff] Disable CommerceHintTimeoutTest.ExtractCart on Mac &…
Browse files Browse the repository at this point in the history
… Win.

Manual merge done on lines 1040-1043.

Failing builders:
https://ci.chromium.org/p/chromium/builders/ci/Mac11%20Tests
https://ci.chromium.org/ui/p/chromium/builders/ci/mac11-arm64-rel-tests

Latest build failure:
https://ci.chromium.org/ui/p/chromium/builders/ci/Mac11%20Tests/8014/overview
https://ci.chromium.org/ui/p/chromium/builders/ci/mac11-arm64-rel-tests/5328/overview

(cherry picked from commit b3e2115)

Bug: 1312849
Change-Id: I1d70c91e9df428e70c5a9eefc4b66da871c9a1b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3567450
Owners-Override: Takashi Sakamoto <tasak@google.com>
Reviewed-by: Minoru Chikamune <chikamune@chromium.org>
Commit-Queue: Takashi Sakamoto <tasak@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#988388}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3582810
Owners-Override: Donn Denman <donnd@chromium.org>
Auto-Submit: Donn Denman <donnd@chromium.org>
Reviewed-by: Yue Zhang <yuezhanggg@chromium.org>
Commit-Queue: Yue Zhang <yuezhanggg@chromium.org>
Cr-Commit-Position: refs/branch-heads/4951@{#743}
Cr-Branched-From: 27de622-refs/heads/main@{#982481}
  • Loading branch information
tasak authored and Chromium LUCI CQ committed Apr 14, 2022
1 parent e73e217 commit c93ba0c
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions chrome/renderer/cart/commerce_hint_agent_browsertest.cc
Expand Up @@ -1037,8 +1037,10 @@ class CommerceHintTimeoutTest : public CommerceHintAgentTest {
base::test::ScopedFeatureList scoped_feature_list_;
};

// Flaky on Linux and ChromeOS: https://crbug.com/1257964.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
// Flaky on Linux, ChromeOS and Windows: https://crbug.com/1257964.
// Falky on Mac: https://crbug.com/1312849.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
BUILDFLAG(IS_MAC)
#define MAYBE_ExtractCart DISABLED_ExtractCart
#else
#define MAYBE_ExtractCart ExtractCart
Expand Down

0 comments on commit c93ba0c

Please sign in to comment.