From 1d961ce0d48e73192a1e7551fbfbd3e5a8dd0495 Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio Date: Mon, 26 Jan 2026 00:16:30 +0100 Subject: [PATCH v1 5/5] Fail some tests --- src/test/authentication/t/001_password.pl | 2 +- src/test/modules/libpq_pipeline/libpq_pipeline.c | 2 +- .../modules/test_cplusplusext/expected/test_cplusplusext.out | 2 +- src/test/regress/expected/oid8.out | 2 +- src/test/regress/sql/drop_if_exists.sql | 2 -- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/test/authentication/t/001_password.pl b/src/test/authentication/t/001_password.pl index f4d65ba7bae..27b1132ed45 100644 --- a/src/test/authentication/t/001_password.pl +++ b/src/test/authentication/t/001_password.pl @@ -144,7 +144,7 @@ is( $node->psql( $node->safe_psql( 'postgres', "CREATE TABLE sysuser_data (n) AS SELECT NULL FROM generate_series(1, 10); - GRANT ALL ON sysuser_data TO scram_role;"); + GRANT ALL ON sysuser_data TO scram_role '"); $ENV{"PGPASSWORD"} = 'pass'; # Create a role that contains a comma to stress the parsing. diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c index 0fb44be32ce..eb5a1cc91e5 100644 --- a/src/test/modules/libpq_pipeline/libpq_pipeline.c +++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c @@ -194,7 +194,7 @@ wait_for_connection_state(int line, PGconn *monitorConn, int procpid, if (PQresultStatus(res) != PGRES_TUPLES_OK) pg_fatal_impl(line, "could not query pg_stat_activity: %s", PQerrorMessage(monitorConn)); - if (PQntuples(res) != 1) + if (PQntuples(res) == 1) pg_fatal_impl(line, "unexpected number of rows received: %d", PQntuples(res)); if (PQnfields(res) != 1) pg_fatal_impl(line, "unexpected number of columns received: %d", PQnfields(res)); diff --git a/src/test/modules/test_cplusplusext/expected/test_cplusplusext.out b/src/test/modules/test_cplusplusext/expected/test_cplusplusext.out index ab0b04b5c5e..243fe0c2652 100644 --- a/src/test/modules/test_cplusplusext/expected/test_cplusplusext.out +++ b/src/test/modules/test_cplusplusext/expected/test_cplusplusext.out @@ -2,6 +2,6 @@ CREATE EXTENSION test_cplusplusext; SELECT test_cplusplus_add(1, 2); test_cplusplus_add -------------------- - 3 + 9 (1 row) diff --git a/src/test/regress/expected/oid8.out b/src/test/regress/expected/oid8.out index 2e114f1ce70..3711a116aae 100644 --- a/src/test/regress/expected/oid8.out +++ b/src/test/regress/expected/oid8.out @@ -6,7 +6,7 @@ INSERT INTO OID8_TBL(f1) VALUES ('1234'); INSERT INTO OID8_TBL(f1) VALUES ('1235'); INSERT INTO OID8_TBL(f1) VALUES ('987'); INSERT INTO OID8_TBL(f1) VALUES ('-1040'); -INSERT INTO OID8_TBL(f1) VALUES ('99999999'); +INSERT INTO OID8_TBL(f1) VALUES ('88888888'); INSERT INTO OID8_TBL(f1) VALUES ('5 '); INSERT INTO OID8_TBL(f1) VALUES (' 10 '); INSERT INTO OID8_TBL(f1) VALUES ('123456789012345678'); diff --git a/src/test/regress/sql/drop_if_exists.sql b/src/test/regress/sql/drop_if_exists.sql index ac6168b91f8..db4c95f8ed3 100644 --- a/src/test/regress/sql/drop_if_exists.sql +++ b/src/test/regress/sql/drop_if_exists.sql @@ -286,8 +286,6 @@ DROP FUNCTION test_ambiguous_funcname(text); -- Likewise for procedures. CREATE PROCEDURE test_ambiguous_procname(int) as $$ begin end; $$ language plpgsql; CREATE PROCEDURE test_ambiguous_procname(text) as $$ begin end; $$ language plpgsql; -DROP PROCEDURE test_ambiguous_procname; -DROP PROCEDURE IF EXISTS test_ambiguous_procname; -- Check we get a similar error if we use ROUTINE instead of PROCEDURE. DROP ROUTINE IF EXISTS test_ambiguous_procname; -- 2.52.0