Skip to content

Commit

Permalink
Revert "Disable PrintSettingsDeathTest.IsColorModelSelectedUnknown on…
Browse files Browse the repository at this point in the history
… Win ASAN"

This reverts commit d8729e7.

Reason for revert: win-asan doesn't actually have 'is_asan = true' in
its gn configs. A bunch of other death tests are failing on the same
bot, so no need to disable a test on an effectively dead bot.

Original change's description:
> Disable PrintSettingsDeathTest.IsColorModelSelectedUnknown on Win ASAN
> 
> Death tests as a whole seem to be flaking on Win ASAN. Disable this test
> until crbug.com/1075661 is resolved.
> 
> Bug: 1074293
> Change-Id: I3b4bb4053852c184fb55630202daee552fb03424
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2204418
> Reviewed-by: Lei Zhang <thestig@chromium.org>
> Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#769342}

TBR=thestig@chromium.org,dhoss@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1074293
Change-Id: Ia0e0b02115ac3f9a8bdb316e35a6771c0ce180b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209400
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770264}
  • Loading branch information
Daniel Hosseinian authored and Commit Bot committed May 19, 2020
1 parent 1b5cd8a commit 0ba4ac7
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions printing/print_settings_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "printing/print_settings.h"

#include "base/test/gtest_util.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"

namespace printing {
Expand All @@ -15,13 +14,7 @@ TEST(PrintSettingsTest, IsColorModelSelected) {
EXPECT_TRUE(IsColorModelSelected(IsColorModelSelected(model).has_value()));
}

// Flaky on Windows ASAN. See crbug.com/1074293.
#if defined(OS_WIN) && defined(ADDRESS_SANITIZER)
#define MAYBE_IsColorModelSelectedUnknown DISABLED_IsColorModelSelectedUnknown
#else
#define MAYBE_IsColorModelSelectedUnknown IsColorModelSelectedUnknown
#endif
TEST(PrintSettingsDeathTest, MAYBE_IsColorModelSelectedUnknown) {
TEST(PrintSettingsDeathTest, IsColorModelSelectedUnknown) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
EXPECT_DCHECK_DEATH(IsColorModelSelected(UNKNOWN_COLOR_MODEL));
EXPECT_DCHECK_DEATH(IsColorModelSelected(UNKNOWN_COLOR_MODEL - 1));
Expand Down

0 comments on commit 0ba4ac7

Please sign in to comment.