Skip to content

Commit e00f486

Browse files
author
Andrei Krichinin
committed
Remove atx2 test from multimaster regression
1 parent 58d36b6 commit e00f486

File tree

2 files changed

+1
-58
lines changed

2 files changed

+1
-58
lines changed

expected/regression_ee.diff

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -550,64 +550,6 @@ diff ../../../src/test/regress/expected/privileges.out ../tmp_check/regress_outd
550550
-- CLUSTER
551551
CREATE INDEX sro_cluster_idx ON sro_tab ((sro_ifun(a) + sro_ifun(0)));
552552
CLUSTER sro_tab USING sro_cluster_idx;
553-
diff ../../../src/test/regress/expected/atx2.out ../tmp_check/regress_outdir/results/atx2.out
554-
--- ../../../src/test/regress/expected/atx2.out CENSORED
555-
+++ ../tmp_check/regress_outdir/results/atx2.out CENSORED
556-
@@ -287,17 +287,14 @@
557-
return 1;
558-
end$$;
559-
select atx_lo_test10(:my_loid);
560-
+NOTICE: other exception 42703, [MTM] failed to prepare transaction at peer node
561-
atx_lo_test10
562-
---------------
563-
1
564-
(1 row)
565-
566-
select lo_unlink(:my_loid);
567-
- lo_unlink
568-
------------
569-
- 1
570-
-(1 row)
571-
-
572-
+ERROR: [MTM] failed to prepare transaction at peer node
573-
-- put some initial data
574-
select lo_creat(-1) as my_loid \gset
575-
select lo_put( :my_loid, 0, 'lo test' );
576-
@@ -356,6 +353,7 @@
577-
declare c2 cursor with hold for select count_tt1_v(), count_tt1_s();
578-
insert into atx_tt1 values(2);
579-
commit;
580-
+ERROR: cannot PREPARE a transaction that has created a cursor WITH HOLD
581-
commit;
582-
begin;
583-
begin autonomous;
584-
@@ -371,6 +369,7 @@
585-
drop function count_tt1_s();
586-
drop table if exists atx_tt1;
587-
close c2;
588-
+ERROR: cursor "c2" does not exist
589-
--
590-
create table atx_13_t(i int);
591-
begin;
592-
@@ -490,9 +489,7 @@
593-
insert into atx_tt2 values(1);
594-
declare c2 cursor with hold for select error_function();
595-
commit;
596-
-NOTICE: other exception 22012, division by zero
597-
-ERROR: control reached end of function without RETURN
598-
-CONTEXT: PL/pgSQL function error_function()
599-
+ERROR: cannot PREPARE a transaction that has created a cursor WITH HOLD
600-
commit;
601-
drop function if exists error_function();
602-
drop table if exists atx_tt2;
603-
@@ -582,6 +579,7 @@
604-
RESET client_min_messages;
605-
create database regression_atx_test_database;
606-
ALTER DATABASE "regression_atx_test_database" SET lc_messages TO 'C';
607-
+ERROR: [MTM] failed to prepare transaction at peer node
608-
\c regression_atx_test_database
609-
create table atx_test as select 1 as id;
610-
begin;
611553
diff ../../../src/test/regress/expected/atx3.out ../tmp_check/regress_outdir/results/atx3.out
612554
--- ../../../src/test/regress/expected/atx3.out CENSORED
613555
+++ ../tmp_check/regress_outdir/results/atx3.out CENSORED

t/001_regress.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
$schedule =~ s/test: largeobject//; # serial schedule
102102
$schedule =~ s/largeobject//; # parallel schedule
103103
$schedule =~ s/atx0//; # parallel schedule
104+
$schedule =~ s/atx2//; # parallel schedule
104105
unlink('parallel_schedule');
105106
if ($Cluster::pg_15_modules)
106107
{

0 commit comments

Comments
 (0)