diff --git a/contrib/bloom/Makefile b/contrib/bloom/Makefile index 6d7a612fe4be196d593642fe2447e88234a4f2b4..8a781e43889575c3b75c18b29013a1e7b324ce1b 100644 --- a/contrib/bloom/Makefile +++ b/contrib/bloom/Makefile @@ -16,9 +16,7 @@ PGFILEDESC = "bloom access method - signature file based index" REGRESS = bloom -# Disable TAP tests for this module for now, as these are unstable on several -# buildfarm environments. -# TAP_TESTS = 1 +TAP_TESTS = 1 ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/bloom/t/001_wal.pl b/contrib/bloom/t/001_wal.pl index 9310af5c3dd87c6a7287dff8d31eac50c7d2dbdd..2bea1e0495768c0457181a175195d3e158faab03 100644 --- a/contrib/bloom/t/001_wal.pl +++ b/contrib/bloom/t/001_wal.pl @@ -16,12 +16,10 @@ sub test_index_replay { my ($test_name) = @_; + local $Test::Builder::Level = $Test::Builder::Level + 1; + # Wait for standby to catch up - my $applname = $node_standby->name; - my $caughtup_query = - "SELECT pg_current_wal_lsn() <= write_lsn FROM pg_stat_replication WHERE application_name = '$applname';"; - $node_primary->poll_query_until('postgres', $caughtup_query) - or die "Timed out while waiting for standby 1 to catch up"; + $node_primary->wait_for_catchup($node_standby); my $queries = qq(SET enable_seqscan=off; SET enable_bitmapscan=on;