Skip to content

Commit ea3e15d

Browse files
michaelpqmichaelpq
committed
Fix test failure with -DENFORCE_REGRESSION_TEST_NAME_RESTRICTIONS
Replication origins created by regression tests should have names starting with "regress_", and the test introduced in b1e48bb for commit timestamps did not do that. Per buildfarm member longfin. Discussion: https://postgr.es/m/20200712122507.GD21680@paquier.xyz
1 parent b1e48bb commit ea3e15d

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

‎src/test/modules/commit_ts/expected/commit_timestamp.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range,
8888
(1 row)
8989

9090
-- Test transaction with replication origin
91-
SELECT pg_replication_origin_create('test_commit_ts: get_origin') != 0
91+
SELECT pg_replication_origin_create('regress_commit_ts: get_origin') != 0
9292
AS valid_roident;
9393
valid_roident
9494
---------------
9595
t
9696
(1 row)
9797

98-
SELECT pg_replication_origin_session_setup('test_commit_ts: get_origin');
98+
SELECT pg_replication_origin_session_setup('regress_commit_ts: get_origin');
9999
pg_replication_origin_session_setup
100100
-------------------------------------
101101

@@ -105,17 +105,17 @@ SELECT txid_current() as txid_with_origin \gset
105105
SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range, r.roname
106106
FROM pg_last_committed_xact() x, pg_replication_origin r
107107
WHERE r.roident = x.roident;
108-
ts_in_range | roname
109-
-------------+----------------------------
110-
t | test_commit_ts: get_origin
108+
ts_in_range | roname
109+
-------------+-------------------------------
110+
t | regress_commit_ts: get_origin
111111
(1 row)
112112

113113
SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range, r.roname
114114
FROM pg_xact_commit_timestamp_origin(:'txid_with_origin') x, pg_replication_origin r
115115
WHERE r.roident = x.roident;
116-
ts_in_range | roname
117-
-------------+----------------------------
118-
t | test_commit_ts: get_origin
116+
ts_in_range | roname
117+
-------------+-------------------------------
118+
t | regress_commit_ts: get_origin
119119
(1 row)
120120

121121
SELECT pg_replication_origin_session_reset();
@@ -124,7 +124,7 @@ SELECT pg_replication_origin_session_reset();
124124

125125
(1 row)
126126

127-
SELECT pg_replication_origin_drop('test_commit_ts: get_origin');
127+
SELECT pg_replication_origin_drop('regress_commit_ts: get_origin');
128128
pg_replication_origin_drop
129129
----------------------------
130130

‎src/test/modules/commit_ts/expected/commit_timestamp_1.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range,
7474
ERROR: could not get commit timestamp data
7575
HINT: Make sure the configuration parameter "track_commit_timestamp" is set.
7676
-- Test transaction with replication origin
77-
SELECT pg_replication_origin_create('test_commit_ts: get_origin') != 0
77+
SELECT pg_replication_origin_create('regress_commit_ts: get_origin') != 0
7878
AS valid_roident;
7979
valid_roident
8080
---------------
8181
t
8282
(1 row)
8383

84-
SELECT pg_replication_origin_session_setup('test_commit_ts: get_origin');
84+
SELECT pg_replication_origin_session_setup('regress_commit_ts: get_origin');
8585
pg_replication_origin_session_setup
8686
-------------------------------------
8787

@@ -104,7 +104,7 @@ SELECT pg_replication_origin_session_reset();
104104

105105
(1 row)
106106

107-
SELECT pg_replication_origin_drop('test_commit_ts: get_origin');
107+
SELECT pg_replication_origin_drop('regress_commit_ts: get_origin');
108108
pg_replication_origin_drop
109109
----------------------------
110110

‎src/test/modules/commit_ts/sql/commit_timestamp.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range,
4242
FROM pg_xact_commit_timestamp_origin(:'txid_no_origin') x;
4343

4444
-- Test transaction with replication origin
45-
SELECT pg_replication_origin_create('test_commit_ts: get_origin') != 0
45+
SELECT pg_replication_origin_create('regress_commit_ts: get_origin') != 0
4646
AS valid_roident;
47-
SELECT pg_replication_origin_session_setup('test_commit_ts: get_origin');
47+
SELECT pg_replication_origin_session_setup('regress_commit_ts: get_origin');
4848
SELECT txid_current() as txid_with_origin \gset
4949
SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range, r.roname
5050
FROM pg_last_committed_xact() x, pg_replication_origin r
@@ -54,4 +54,4 @@ SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range,
5454
WHERE r.roident = x.roident;
5555

5656
SELECT pg_replication_origin_session_reset();
57-
SELECT pg_replication_origin_drop('test_commit_ts: get_origin');
57+
SELECT pg_replication_origin_drop('regress_commit_ts: get_origin');

0 commit comments

Comments
 (0)