Commit 6214d5b9 authored by Daniel Hosseinian's avatar Daniel Hosseinian Committed by Commit Bot

Revert "[Sheriff] Disable SQLDatabaseTest on Windows ASAN because they are flaky"

This reverts commit 146b9f1b.

Reason for revert: These tests were actually failing because death
tests weren't working on win-asan. That problem has been fixed as of
r771124. Also win-asan is not accurately named as it does not define
ADDRESS_SANITIZER.

Original change's description:
> [Sheriff] Disable SQLDatabaseTest on Windows ASAN because they are flaky
>
> Bug: 1027481
> Change-Id: I7fc1806eada39c58f3f6035736bf9d5c595fbb0b
> TBR: pwnall@chromium.org
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1946331
> Reviewed-by: Guido Urdaneta <guidou@chromium.org>
> Commit-Queue: Guido Urdaneta <guidou@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#720463}

TBR=guidou@chromium.org,gab@chromium.org

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

Bug: 1027481
Change-Id: I91ab2178d555e7ee852d7a8bf6bb5b0ca90f806d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2216358
Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
Reviewed-by: default avatarDaniel Hosseinian <dhoss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771889}
parent 6f15fae3
......@@ -135,13 +135,7 @@ TEST_F(SQLDatabaseTest, ExecuteWithErrorCode) {
"INSERT INTO foo(a, b) VALUES (1, 2, 3, 4)"));
}
// Flaky on Windows ASAN. https://crbug.com/1027481
#if defined(OS_WIN) && defined(ADDRESS_SANITIZER)
#define MAYBE_CachedStatement DISABLED_CachedStatement
#else
#define MAYBE_CachedStatement CachedStatement
#endif
TEST_F(SQLDatabaseTest, MAYBE_CachedStatement) {
TEST_F(SQLDatabaseTest, CachedStatement) {
sql::StatementID id1 = SQL_FROM_HERE;
sql::StatementID id2 = SQL_FROM_HERE;
static const char kId1Sql[] = "SELECT a FROM foo";
......@@ -685,13 +679,7 @@ TEST_F(SQLDatabaseTest, RazeAndClose) {
// Test that various operations fail without crashing after
// RazeAndClose().
// Flaky on Windows ASAN. https://crbug.com/1027481
#if defined(OS_WIN) && defined(ADDRESS_SANITIZER)
#define MAYBE_RazeAndCloseDiagnostics DISABLED_RazeAndCloseDiagnostics
#else
#define MAYBE_RazeAndCloseDiagnostics RazeAndCloseDiagnostics
#endif
TEST_F(SQLDatabaseTest, MAYBE_RazeAndCloseDiagnostics) {
TEST_F(SQLDatabaseTest, RazeAndCloseDiagnostics) {
const char* kCreateSql = "CREATE TABLE foo (id INTEGER PRIMARY KEY, value)";
const char* kPopulateSql = "INSERT INTO foo (value) VALUES (12)";
const char* kSimpleSql = "SELECT 1";
......@@ -1235,13 +1223,7 @@ TEST_F(SQLDatabaseTest, GetAppropriateMmapSizeAltStatus) {
// To prevent invalid SQL from accidentally shipping to production, prepared
// statements which fail to compile with SQLITE_ERROR call DLOG(DCHECK). This
// case cannot be suppressed with an error callback.
// Flaky on Windows ASAN. https://crbug.com/1027481
#if defined(OS_WIN) && defined(ADDRESS_SANITIZER)
#define MAYBE_CompileError DISABLED_CompileError
#else
#define MAYBE_CompileError CompileError
#endif
TEST_F(SQLDatabaseTest, MAYBE_CompileError) {
TEST_F(SQLDatabaseTest, CompileError) {
// DEATH tests not supported on Android, iOS, or Fuchsia.
#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_FUCHSIA)
if (DLOG_IS_ON(FATAL)) {
......
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