Skip to content

Commit

Permalink
Fix All/DesksClientTest.SystemUILaunchSnappedWindow/* timeout on chro…
Browse files Browse the repository at this point in the history
…meos bots

First build failure:
https://ci.chromium.org/ui/p/chromium/builders/ci/linux-chromeos-rel/70538/overview

The timeouts seem to be caused by crrev.com/c/4987197. If
FasterSplitScreenSetup is enabled, the tests seem to fail.

(cherry picked from commit e52bd1b)

Bug: 1497876
Change-Id: I5e958d60566c7ebf8afde93cdfacd2b79d3d8bb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4992541
Reviewed-by: Miriam Polzer <[email protected]>
Owners-Override: Miriam Polzer <[email protected]>
Commit-Queue: Takashi Sakamoto <[email protected]>
Cr-Original-Commit-Position: refs/heads/main@{#1217995}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4998187
Commit-Queue: Joe Downing <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>
Owners-Override: Joe Downing <[email protected]>
Cr-Commit-Position: refs/branch-heads/6099@{#60}
Cr-Branched-From: e6ee450-refs/heads/main@{#1217362}
  • Loading branch information
tasak authored and Chromium LUCI CQ committed Nov 1, 2023
1 parent 4e1a307 commit e4c2037
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion chrome/browser/ui/ash/desks/desks_client_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,8 @@ class DesksClientTest : public extensions::PlatformAppBrowserTest,
std::vector<base::test::FeatureRef> enabled_features = {
ash::features::kDesksTemplates};
std::vector<base::test::FeatureRef> disabled_features = {
ash::features::kDeskTemplateSync};
ash::features::kDeskTemplateSync,
ash::features::kFasterSplitScreenSetup};
if (GetParam()) {
enabled_features.push_back(chromeos::features::kJelly);
} else {
Expand Down

0 comments on commit e4c2037

Please sign in to comment.