Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit dad9ba1

Browse files
committed
Fix buildfarm failures in pg_walinspect tests.
1 parent 12aaae5 commit dad9ba1

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

contrib/pg_walinspect/Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ DATA = pg_walinspect--1.0.sql
1111

1212
REGRESS = pg_walinspect
1313

14+
REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_walinspect/walinspect.conf
15+
16+
# Disabled because these tests require "wal_level=replica", which
17+
# some installcheck users do not have (e.g. buildfarm clients).
18+
NO_INSTALLCHECK = 1
19+
1420
ifdef USE_PGXS
1521
PG_CONFIG = pg_config
1622
PGXS := $(shell $(PG_CONFIG) --pgxs)

contrib/pg_walinspect/expected/pg_walinspect.out

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
CREATE EXTENSION pg_walinspect;
2-
CREATE TABLE sample_tbl(col1 int, col2 int);
32
-- Make sure checkpoints don't interfere with the test.
4-
SELECT lsn as wal_lsn1 FROM
5-
pg_create_physical_replication_slot('regress_pg_walinspect_slot', true, false)
6-
\gset
3+
SELECT 'init' FROM pg_create_physical_replication_slot('regress_pg_walinspect_slot', true, false);
4+
?column?
5+
----------
6+
init
7+
(1 row)
8+
9+
CREATE TABLE sample_tbl(col1 int, col2 int);
10+
SELECT pg_current_wal_lsn() AS wal_lsn1 \gset
711
INSERT INTO sample_tbl SELECT * FROM generate_series(1, 2);
812
SELECT pg_current_wal_lsn() AS wal_lsn2 \gset
913
INSERT INTO sample_tbl SELECT * FROM generate_series(1, 2);

contrib/pg_walinspect/sql/pg_walinspect.sql

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
CREATE EXTENSION pg_walinspect;
22

3+
-- Make sure checkpoints don't interfere with the test.
4+
SELECT 'init' FROM pg_create_physical_replication_slot('regress_pg_walinspect_slot', true, false);
5+
36
CREATE TABLE sample_tbl(col1 int, col2 int);
47

5-
-- Make sure checkpoints don't interfere with the test.
6-
SELECT lsn as wal_lsn1 FROM
7-
pg_create_physical_replication_slot('regress_pg_walinspect_slot', true, false)
8-
\gset
8+
SELECT pg_current_wal_lsn() AS wal_lsn1 \gset
99

1010
INSERT INTO sample_tbl SELECT * FROM generate_series(1, 2);
1111

contrib/pg_walinspect/walinspect.conf

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
wal_level = replica
2+
max_replication_slots = 4

0 commit comments

Comments
 (0)