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

Modified Files:
	init_subscribe_set.ik 
Log Message:
Remedying tests so that STORE NODE, EXECUTE SCRIPT, and WAIT FOR EVENT
all provide values for slonik parameters that are no longer optional
in v2.0


Index: init_subscribe_set.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testmultipaths/init_subscribe_set.ik,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** init_subscribe_set.ik	19 Oct 2007 21:31:35 -0000	1.2
--- init_subscribe_set.ik	11 Apr 2008 15:39:32 -0000	1.3
***************
*** 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);
      
--- 1,13 ----
  subscribe set (id = 1, provider = 1, receiver = 2, forward = yes);
  sync (id=1);
! wait for event (origin = all, confirmed = 2, wait on = 1);
  subscribe set (id = 1, provider = 1, receiver = 3, forward = yes);
  sync (id=1);
! wait for event (origin = all, confirmed = 3, wait on = 1);
  subscribe set (id = 2, provider = 1, receiver = 2, forward = yes);
  sync (id=1);
! wait for event (origin = all, confirmed = 2, wait on = 1);
  subscribe set (id = 2, provider = 2, receiver = 3, forward = yes);
  sync (id=1);
! wait for event (origin = all, confirmed = 3, wait on = 1);