Update of /home/cvsd/slony1/slony1-engine/src/ducttape
In directory main.slony.info:/tmp/cvs-serv27179

Modified Files:
	test_2_pgbench.in test_3_pgbench.in test_4_pgbench.in 
	test_5_ddlscript test_5_pgbench.in test_6_autolisten.in 
	test_8_logship.in test_J_pgbench.in 
Log Message:
Modify ducttape scripts to add EVENT NODE / WAIT ON values that are now
mandatory, rather than being handled via defaults


Index: test_2_pgbench.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_2_pgbench.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_2_pgbench.in	23 Jan 2008 17:12:34 -0000	1.5
--- test_2_pgbench.in	11 Apr 2008 18:00:36 -0000	1.6
***************
*** 224,228 ****
  
  	try {
! 		store node (id = 2, comment = 'Node 2');
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');
--- 224,228 ----
  
  	try {
! 		store node (id = 2, comment = 'Node 2', event node=1);
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');
***************
*** 297,301 ****
  	node 3 admin conninfo = 'dbname=$DB3';
  
! 	store node (id = 3, comment = 'Node 3');
  
  	store path (server = 1, client = 3, conninfo = 'dbname=$DB1');
--- 297,301 ----
  	node 3 admin conninfo = 'dbname=$DB3';
  
! 	store node (id = 3, comment = 'Node 3', event node=1);
  
  	store path (server = 1, client = 3, conninfo = 'dbname=$DB1');

Index: test_4_pgbench.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_4_pgbench.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_4_pgbench.in	4 Jul 2005 23:45:21 -0000	1.1
--- test_4_pgbench.in	11 Apr 2008 18:00:36 -0000	1.2
***************
*** 195,199 ****
  	node 2 admin conninfo = 'dbname=$DB2';
  	try {
! 		store node (id = 2, comment = 'Node 2');
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');
--- 195,199 ----
  	node 2 admin conninfo = 'dbname=$DB2';
  	try {
! 		store node (id = 2, comment = 'Node 2', event node=1);
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');

Index: test_3_pgbench.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_3_pgbench.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_3_pgbench.in	1 Jun 2006 12:35:52 -0000	1.2
--- test_3_pgbench.in	11 Apr 2008 18:00:36 -0000	1.3
***************
*** 266,270 ****
  	node 2 admin conninfo = 'dbname=$DB2';
  	try {
! 		store node (id = 2, comment = 'Node 2');
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');
--- 266,270 ----
  	node 2 admin conninfo = 'dbname=$DB2';
  	try {
! 		store node (id = 2, comment = 'Node 2', event node=1);
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');

Index: test_5_pgbench.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_5_pgbench.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_5_pgbench.in	5 Jun 2007 22:22:07 -0000	1.4
--- test_5_pgbench.in	11 Apr 2008 18:00:36 -0000	1.5
***************
*** 209,213 ****
  	node 2 admin conninfo = 'dbname=$DB2';
  	try {
! 		store node (id = 2, comment = 'Node 2');
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');
--- 209,213 ----
  	node 2 admin conninfo = 'dbname=$DB2';
  	try {
! 		store node (id = 2, comment = 'Node 2', event node=1);
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');

Index: test_J_pgbench.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_J_pgbench.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_J_pgbench.in	29 Nov 2006 20:13:37 -0000	1.2
--- test_J_pgbench.in	11 Apr 2008 18:00:36 -0000	1.3
***************
*** 224,228 ****
  
  	try {
! 		store node (id = 2, comment = 'Node 2');
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');
--- 224,228 ----
  
  	try {
! 		store node (id = 2, comment = 'Node 2', event node=1);
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');
***************
*** 302,306 ****
  	node 3 admin conninfo = 'dbname=$DB3';
  
! 	store node (id = 3, comment = 'Node 3');
  
  	store path (server = 1, client = 3, conninfo = 'dbname=$DB1');
--- 302,306 ----
  	node 3 admin conninfo = 'dbname=$DB3';
  
! 	store node (id = 3, comment = 'Node 3', event node=1);
  
  	store path (server = 1, client = 3, conninfo = 'dbname=$DB1');

Index: test_5_ddlscript
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_5_ddlscript,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_5_ddlscript	5 Jun 2007 22:22:07 -0000	1.3
--- test_5_ddlscript	11 Apr 2008 18:00:36 -0000	1.4
***************
*** 91,95 ****
  
  	echo '  wait for execute script';
! 	wait for event (origin = 1, confirmed = 2);
  
  	try {
--- 91,95 ----
  
  	echo '  wait for execute script';
! 	wait for event (origin = 1, confirmed = 2, wait on=1);
  
  	try {

Index: test_8_logship.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_8_logship.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_8_logship.in	27 Sep 2007 14:22:59 -0000	1.7
--- test_8_logship.in	11 Apr 2008 18:00:36 -0000	1.8
***************
*** 232,236 ****
  
  	try {
! 		store node (id = 2, comment = 'Node 2');
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');
--- 232,236 ----
  
  	try {
! 		store node (id = 2, comment = 'Node 2', event node=1);
  		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
  		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');
***************
*** 313,317 ****
  	node 3 admin conninfo = 'dbname=$DB3';
  
! 	store node (id = 3, comment = 'Node 3');
  
  	store path (server = 1, client = 3, conninfo = 'dbname=$DB1');
--- 313,317 ----
  	node 3 admin conninfo = 'dbname=$DB3';
  
! 	store node (id = 3, comment = 'Node 3', event node=1);
  
  	store path (server = 1, client = 3, conninfo = 'dbname=$DB1');

Index: test_6_autolisten.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_6_autolisten.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_6_autolisten.in	1 Jun 2006 12:35:52 -0000	1.2
--- test_6_autolisten.in	11 Apr 2008 18:00:36 -0000	1.3
***************
*** 76,80 ****
  $PREAMBLE
  	try {
! 		store node (id = $NODE, comment = 'Node $NODE');
  		store path (server = $PARENT, client = $NODE, conninfo = 'dbname=slony_test$PARENT');
  		store path (server = $NODE, client = $PARENT, conninfo = 'dbname=slony_test$NODE');
--- 76,80 ----
  $PREAMBLE
  	try {
! 		store node (id = $NODE, comment = 'Node $NODE', event node=${PARENT});
  		store path (server = $PARENT, client = $NODE, conninfo = 'dbname=slony_test$PARENT');
  		store path (server = $NODE, client = $PARENT, conninfo = 'dbname=slony_test$NODE');
***************
*** 296,300 ****
  $PREAMBLE
  	try {
! 		store node (id = 4, comment = 'Node $node');
  		store path (server = 3, client = 4, conninfo = 'dbname=slony_test3');
  		store path (server = 4, client = 3, conninfo = 'dbname=slony_test4');
--- 296,300 ----
  $PREAMBLE
  	try {
! 		store node (id = 4, comment = 'Node $node', event node=1);
  		store path (server = 3, client = 4, conninfo = 'dbname=slony_test3');
  		store path (server = 4, client = 3, conninfo = 'dbname=slony_test4');
***************
*** 332,336 ****
  $PREAMBLE
  	try {
! 		store node (id = $node, comment = 'Node $node');
  		store path (server = 4, client = $node, conninfo = 'dbname=slony_test4');
  		store path (server = $node, client = 4, conninfo = 'dbname=slony_test$node');
--- 332,336 ----
  $PREAMBLE
  	try {
! 		store node (id = $node, comment = 'Node $node', event node=1);
  		store path (server = 4, client = $node, conninfo = 'dbname=slony_test4');
  		store path (server = $node, client = 4, conninfo = 'dbname=slony_test$node');