From 02f4192c796b528d1604b193d2431d0370c493a6 Mon Sep 17 00:00:00 2001 From: sagnghos Date: Wed, 7 Jan 2026 08:17:29 +0000 Subject: [PATCH 1/2] test: skip PGErrorCode assert check for experimental host --- .../test/java/com/google/cloud/spanner/it/ITQueryTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java index 83140bccdab..915c379e18b 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java @@ -17,6 +17,7 @@ package com.google.cloud.spanner.it; import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator; +import static com.google.cloud.spanner.testing.ExperimentalHostHelper.isExperimentalHost; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.truth.Truth.assertThat; import static java.util.Arrays.asList; @@ -143,7 +144,10 @@ public void badQuery() { exception.getMessage().contains("column \"apples\" does not exist")); // See https://www.postgresql.org/docs/current/errcodes-appendix.html // '42703' == undefined_column - assertEquals("42703", exception.getPostgreSQLErrorCode()); + // Skipping the check for experimental host - b/473270453 + if (!isExperimentalHost()) { + assertEquals("42703", exception.getPostgreSQLErrorCode()); + } } else { assertTrue( exception.getMessage(), exception.getMessage().contains("Unrecognized name: Apples")); From 23b29bd4561fc16dda683a82ec1f2bb79917c48f Mon Sep 17 00:00:00 2001 From: sagnghos Date: Wed, 7 Jan 2026 08:31:47 +0000 Subject: [PATCH 2/2] gemini suggested code applied --- .../java/com/google/cloud/spanner/it/ITQueryTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java index 915c379e18b..4a21af49aaa 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java @@ -144,10 +144,10 @@ public void badQuery() { exception.getMessage().contains("column \"apples\" does not exist")); // See https://www.postgresql.org/docs/current/errcodes-appendix.html // '42703' == undefined_column - // Skipping the check for experimental host - b/473270453 - if (!isExperimentalHost()) { - assertEquals("42703", exception.getPostgreSQLErrorCode()); - } + assumeFalse( + "Skipping PGErrorCode check on experimental host due to b/473270453", + isExperimentalHost()); + assertEquals("42703", exception.getPostgreSQLErrorCode()); } else { assertTrue( exception.getMessage(), exception.getMessage().contains("Unrecognized name: Apples"));