Remove regression test atx2 and update regression_ee.diff

Tag: Multimaster

Author: Mikhail Rutman

expected/regression_ee.diff

@@ -550,64 +550,6 @@ diff ../../../src/test/regress/expected/privileges.out ../tmp_check/regress_outd
  -- CLUSTER
  CREATE INDEX sro_cluster_idx ON sro_tab ((sro_ifun(a) + sro_ifun(0)));
  CLUSTER sro_tab USING sro_cluster_idx;
-diff ../../../src/test/regress/expected/atx2.out ../tmp_check/regress_outdir/results/atx2.out
---- ../../../src/test/regress/expected/atx2.out	CENSORED
-+++ ../tmp_check/regress_outdir/results/atx2.out	CENSORED
-@@ -287,17 +287,14 @@
-   return 1;
- end$$;
- select atx_lo_test10(:my_loid);
-+NOTICE:  other exception 42703, [MTM] failed to prepare transaction at peer node
-  atx_lo_test10 
- ---------------
-              1
- (1 row)
- 
- select lo_unlink(:my_loid);
-- lo_unlink 
-------------
--         1
--(1 row)
--
-+ERROR:  [MTM] failed to prepare transaction at peer node
- -- put some initial data
- select lo_creat(-1) as my_loid \gset
- select lo_put( :my_loid, 0, 'lo test' );
-@@ -356,6 +353,7 @@
-     declare c2 cursor with hold for select count_tt1_v(), count_tt1_s();
-     insert into atx_tt1 values(2);
-   commit;
-+ERROR:  cannot PREPARE a transaction that has created a cursor WITH HOLD
- commit;
- begin;
-   begin autonomous;
-@@ -371,6 +369,7 @@
- drop function count_tt1_s();
- drop table if exists atx_tt1;
- close c2;
-+ERROR:  cursor "c2" does not exist
- -- 13
- create table atx_13_t(i int);
- begin;
-@@ -490,9 +489,7 @@
- 		insert into atx_tt2 values(1);
- 		declare c2 cursor with hold for select error_function();
- 	commit;
--NOTICE:  other exception 22012, division by zero
--ERROR:  control reached end of function without RETURN
--CONTEXT:  PL/pgSQL function error_function()
-+ERROR:  cannot PREPARE a transaction that has created a cursor WITH HOLD
- commit;
- drop function if exists error_function();
- drop table if exists atx_tt2;
-@@ -582,6 +579,7 @@
- RESET client_min_messages;
- create database regression_atx_test_database;
- ALTER DATABASE "regression_atx_test_database" SET lc_messages TO 'C';
-+ERROR:  [MTM] failed to prepare transaction at peer node
- \c regression_atx_test_database
- create table atx_test as select 1 as id;
- begin;
 diff ../../../src/test/regress/expected/atx3.out ../tmp_check/regress_outdir/results/atx3.out
 --- ../../../src/test/regress/expected/atx3.out	CENSORED
 +++ ../tmp_check/regress_outdir/results/atx3.out	CENSORED
@@ -794,7 +736,6 @@ diff ../../../src/test/regress/expected/publication.out ../tmp_check/regress_out
                                                List of publications
          Name        |          Owner           | All tables | Inserts | Updates | Deletes | Truncates | Via root 
  --------------------+--------------------------+------------+---------+---------+---------+-----------+----------
-+ multimaster        | miker                    | f          | t       | f       | f       | t         | f
   testpib_ins_trunct | regress_publication_user | f          | t       | f       | f       | f         | f
   testpub_default    | regress_publication_user | f          | f       | t       | f       | f         | f
 -(2 rows)
@@ -805,7 +746,6 @@ diff ../../../src/test/regress/expected/publication.out ../tmp_check/regress_out
                                                List of publications
          Name        |          Owner           | All tables | Inserts | Updates | Deletes | Truncates | Via root 
  --------------------+--------------------------+------------+---------+---------+---------+-----------+----------
-+ multimaster        | miker                    | f          | t       | f       | f       | t         | f
   testpib_ins_trunct | regress_publication_user | f          | t       | f       | f       | f         | f
   testpub_default    | regress_publication_user | f          | t       | t       | t       | f         | f
 -(2 rows)

t/001_regress.pl

@@ -86,6 +86,7 @@
 $schedule =~ s/test: largeobject//; # serial schedule
 $schedule =~ s/largeobject//; # parallel schedule
 $schedule =~ s/atx0//; # parallel schedule
+$schedule =~ s/atx2//; # parallel schedule
 unlink('parallel_schedule');
 TestLib::append_to_file('parallel_schedule', $schedule);
 
@@ -142,8 +143,12 @@
 {
 	$expected_file = "expected/regression_vanilla.diff"
 }
+# Remove lines which contains random data (like ports, users, etc) from output file
+# Remove line which starts with '+ mtm_sub_' from output file because it contains random user
+run [ "sed", "-i", "/+ mtm_sub_/d", "$ENV{TESTDIR}/results/regression.diff" ];
+# Remove line which starts from '+ multimaster' from output file because it contains random port number
+run [ "sed", "-i", "/+ multimaster/d", "$ENV{TESTDIR}/results/regression.diff" ];
 $diff = TestLib::system_log("diff -U3 ${expected_file} $ENV{TESTDIR}/results/regression.diff");
-run [ "sed", "-i", "/mtm_sub_/d", "$ENV{TESTDIR}/results/regression.diff" ];
 run [ "diff", "-U3", "${expected_file}", "$ENV{TESTDIR}/results/regression.diff" ], ">", "$ENV{TESTDIR}/regression.diff.diff";
 my $res = $?;