From 02cde54d2cd0c85cc04933baeeddb7aefa474399 Mon Sep 17 00:00:00 2001
From: Jason Petersen <jason@citusdata.com>
Date: Wed, 5 Oct 2016 11:28:28 -0600
Subject: [PATCH] Address differences in CONTEXT output

Just squelched some output in one test.
---
 src/test/regress/expected/multi_modifying_xacts.out | 11 ++++-------
 src/test/regress/sql/multi_modifying_xacts.sql      |  4 ++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/test/regress/expected/multi_modifying_xacts.out b/src/test/regress/expected/multi_modifying_xacts.out
index b8b83a5e9..a7f030076 100644
--- a/src/test/regress/expected/multi_modifying_xacts.out
+++ b/src/test/regress/expected/multi_modifying_xacts.out
@@ -86,6 +86,7 @@ SELECT name FROM researchers WHERE lab_id = 3 AND id = 6;
 (1 row)
 
 -- even if created by PL/pgSQL...
+\set VERBOSITY terse
 BEGIN;
 DO $$
 BEGIN
@@ -120,6 +121,7 @@ END $$;
 NOTICE:  caught not_null_violation
 COMMIT;
 ERROR:  cannot ROLLBACK TO SAVEPOINT in transactions which modify distributed tables
+\set VERBOSITY default
 -- should be valid to edit labs after researchers...
 BEGIN;
 INSERT INTO researchers VALUES (8, 5, 'Douglas Engelbart');
@@ -318,11 +320,11 @@ DEFERRABLE INITIALLY IMMEDIATE
 FOR EACH ROW EXECUTE PROCEDURE reject_bad();
 \c - - - :master_port
 -- test partial failure; worker_1 succeeds, 2 fails
+\set VERBOSITY terse
 BEGIN;
 INSERT INTO objects VALUES (1, 'apple');
 INSERT INTO objects VALUES (2, 'BAD');
 WARNING:  illegal value
-CONTEXT:  while executing command on localhost:57638
 INSERT INTO labs VALUES (7, 'E Corp');
 COMMIT;
 -- data should be persisted
@@ -378,11 +380,9 @@ BEGIN;
 INSERT INTO objects VALUES (1, 'apple');
 INSERT INTO objects VALUES (2, 'BAD');
 WARNING:  illegal value
-CONTEXT:  while executing command on localhost:57638
 INSERT INTO labs VALUES (8, 'Aperture Science');
 INSERT INTO labs VALUES (9, 'BAD');
 WARNING:  illegal value
-CONTEXT:  while executing command on localhost:57637
 ERROR:  could not modify any active placements
 COMMIT;
 -- data should NOT be persisted
@@ -424,7 +424,6 @@ INSERT INTO objects VALUES (2, 'BAD');
 INSERT INTO labs VALUES (9, 'Umbrella Corporation');
 COMMIT;
 WARNING:  illegal value
-CONTEXT:  while executing command on localhost:57638
 -- data should be persisted
 SELECT * FROM objects WHERE id = 2;
  id | name 
@@ -473,9 +472,7 @@ INSERT INTO labs VALUES (8, 'Aperture Science');
 INSERT INTO labs VALUES (9, 'BAD');
 COMMIT;
 WARNING:  illegal value
-CONTEXT:  while executing command on localhost:57638
 WARNING:  illegal value
-CONTEXT:  while executing command on localhost:57637
 ERROR:  could not commit transaction on any active nodes
 -- data should NOT be persisted
 SELECT * FROM objects WHERE id = 1;
@@ -511,7 +508,7 @@ INSERT INTO labs VALUES (8, 'Aperture Science');
 INSERT INTO labs VALUES (9, 'BAD');
 COMMIT;
 WARNING:  illegal value
-CONTEXT:  while executing command on localhost:57637
+\set VERBOSITY default
 -- data to objects should be persisted, but labs should not...
 SELECT * FROM objects WHERE id = 1;
  id | name  
diff --git a/src/test/regress/sql/multi_modifying_xacts.sql b/src/test/regress/sql/multi_modifying_xacts.sql
index 7c3395705..0eec2d059 100644
--- a/src/test/regress/sql/multi_modifying_xacts.sql
+++ b/src/test/regress/sql/multi_modifying_xacts.sql
@@ -63,6 +63,7 @@ COMMIT;
 SELECT name FROM researchers WHERE lab_id = 3 AND id = 6;
 
 -- even if created by PL/pgSQL...
+\set VERBOSITY terse
 BEGIN;
 DO $$
 BEGIN
@@ -93,6 +94,7 @@ EXCEPTION
         RAISE NOTICE 'caught not_null_violation';
 END $$;
 COMMIT;
+\set VERBOSITY default
 
 
 -- should be valid to edit labs after researchers...
@@ -247,6 +249,7 @@ FOR EACH ROW EXECUTE PROCEDURE reject_bad();
 \c - - - :master_port
 
 -- test partial failure; worker_1 succeeds, 2 fails
+\set VERBOSITY terse
 BEGIN;
 INSERT INTO objects VALUES (1, 'apple');
 INSERT INTO objects VALUES (2, 'BAD');
@@ -399,6 +402,7 @@ INSERT INTO objects VALUES (1, 'apple');
 INSERT INTO labs VALUES (8, 'Aperture Science');
 INSERT INTO labs VALUES (9, 'BAD');
 COMMIT;
+\set VERBOSITY default
 
 -- data to objects should be persisted, but labs should not...
 SELECT * FROM objects WHERE id = 1;