Update of /home/cvsd/slony1/slony1-engine/tests/testmultipaths
In directory main.slony.info:/tmp/cvs-serv11327

Modified Files:
	init_subscribe_set.ik 
Log Message:
Fix up subscription WAIT FOR EVENT requests so that they use SYNCs in
between and _properly_ wait for subscriptions to complete.


Index: init_subscribe_set.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testmultipaths/init_subscribe_set.ik,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** init_subscribe_set.ik	24 Sep 2007 21:26:34 -0000	1.1
--- init_subscribe_set.ik	19 Oct 2007 21:31:35 -0000	1.2
***************
*** 1,10 ****
  subscribe set (id = 1, provider = 1, receiver = 2, forward = yes);
  WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = ALL, WAIT ON = 2);
  subscribe set (id = 1, provider = 1, receiver = 3, forward = yes);
  WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = ALL, WAIT ON = 3);
! 
  subscribe set (id = 2, provider = 1, receiver = 2, forward = yes);
  WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = ALL, WAIT ON = 2);
  subscribe set (id = 2, provider = 2, receiver = 3, forward = yes);
  WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = ALL, WAIT ON = 3);
!     
\ No newline at end of file
--- 1,17 ----
  subscribe set (id = 1, provider = 1, receiver = 2, forward = yes);
  WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = ALL, WAIT ON = 2);
+ sync (id=1);
+ WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = 2, WAIT ON = 2);
  subscribe set (id = 1, provider = 1, receiver = 3, forward = yes);
  WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = ALL, WAIT ON = 3);
! sync (id=1);
! WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = 3, WAIT ON = 3);
  subscribe set (id = 2, provider = 1, receiver = 2, forward = yes);
  WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = ALL, WAIT ON = 2);
+ sync (id=1);
+ WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = 2, WAIT ON = 2);
  subscribe set (id = 2, provider = 2, receiver = 3, forward = yes);
  WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = ALL, WAIT ON = 3);
! sync (id=1);
! WAIT FOR EVENT (ORIGIN = ALL, CONFIRMED = 3, WAIT ON = 3);
!