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

Modified Files:
	test_5_pgbench.in test_5_subscribe 
Log Message:
Fix SYNC so that WAIT FOR EVENT finally works.

Jan


Index: test_5_pgbench.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_5_pgbench.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_5_pgbench.in	1 Jun 2006 12:35:52 -0000	1.2
--- test_5_pgbench.in	15 May 2007 19:40:16 -0000	1.3
***************
*** 93,96 ****
--- 93,103 ----
  createdb $DB1 || exit 1
  pgbench -i -s $PGBENCH_SCALE $DB1
+ psql $DB1 <<_EOF_
+ 	create sequence history_seq;
+ 	alter table history add column seqno int8;
+ 	alter table history alter column seqno set default nextval('history_seq');
+ 	update history set seqno = nextval('history_seq') where seqno is null;
+ 	alter table history add primary key (seqno);
+ _EOF_
  pg_dump -s $DB1 >pgbench_schema.sql
  
***************
*** 141,151 ****
  
  	try {
- 		table add key (node id = 1, fully qualified name = 'public.history');
- 	}
- 	on error {
- 		exit 1;
- 	}
- 
- 	try {
  		create set (id = 1, origin = 1, comment = 'Set 1 - pgbench tables');
  		set add table (set id = 1, origin = 1,
--- 148,151 ----
***************
*** 160,164 ****
  		set add table (set id = 1, origin = 1,
  			id = 4, fully qualified name = 'public.history',
! 			key = serial, comment = 'Table accounts');
  	}
  	on error {
--- 160,164 ----
  		set add table (set id = 1, origin = 1,
  			id = 4, fully qualified name = 'public.history',
! 			comment = 'Table history');
  	}
  	on error {
***************
*** 286,290 ****
  			from tellers_sum order by su_tid;
  	select 'history:'::text, tid, bid, aid, delta, mtime, filler,
! 			"_Slony-I_T1_rowID" from history order by "_Slony-I_T1_rowID";
  _EOF_
  psql $DB2 -o dump.tmp.2.$$ <<_EOF_
--- 286,290 ----
  			from tellers_sum order by su_tid;
  	select 'history:'::text, tid, bid, aid, delta, mtime, filler,
! 			seqno from history order by seqno;
  _EOF_
  psql $DB2 -o dump.tmp.2.$$ <<_EOF_
***************
*** 300,304 ****
  			from tellers_sum order by su_tid;
  	select 'history:'::text, tid, bid, aid, delta, mtime, filler,
! 			"_Slony-I_T1_rowID" from history order by "_Slony-I_T1_rowID";
  _EOF_
  
--- 300,304 ----
  			from tellers_sum order by su_tid;
  	select 'history:'::text, tid, bid, aid, delta, mtime, filler,
! 			seqno from history order by seqno;
  _EOF_
  

Index: test_5_subscribe
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_5_subscribe,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_5_subscribe	30 Oct 2006 14:48:18 -0000	1.3
--- test_5_subscribe	15 May 2007 19:40:16 -0000	1.4
***************
*** 29,35 ****
  		exit 1;
  	}
! 	echo '***** Waiting for subscribe set to arrive on origin';
! 	wait for event (origin = 2, confirmed = 1);
! 	echo '***** Subscribe set received on origin - issue SYNC';
  	sync (id = 1);
  	echo '***** Waiting for SYNC to be done on subscriber';
--- 29,33 ----
  		exit 1;
  	}
! 	echo '***** Subscribe set queued - issue SYNC';
  	sync (id = 1);
  	echo '***** Waiting for SYNC to be done on subscriber';