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

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/testmultiplemoves/init_subscribe_set.ik,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** init_subscribe_set.ik	27 Oct 2006 19:44:06 -0000	1.3
--- init_subscribe_set.ik	11 Apr 2008 15:39:32 -0000	1.4
***************
*** 1,19 ****
  subscribe set (id=1, provider=1, receiver = 2, forward=yes);
- wait for event (origin=2, confirmed=1);
  sync(id=1);
! wait for event (origin=1, confirmed=2);
  
  subscribe set (id=2, provider=1, receiver = 2, forward=yes);
- wait for event (origin=2, confirmed=1);
  sync(id=1);
! wait for event (origin=1, confirmed=2);
  
  subscribe set (id=1, provider=2, receiver = 3, forward=yes);
- wait for event (origin=3, confirmed=2);
  sync(id=1);
! wait for event (origin=1, confirmed=3);
  
  subscribe set (id=2, provider=2, receiver = 3, forward=yes);
- wait for event (origin=3, confirmed=2);
  sync(id=1);
! wait for event (origin=1, confirmed=3);
--- 1,15 ----
  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=2, provider=1, receiver = 2, forward=yes);
  sync(id=1);
! wait for event (origin=all, confirmed=2, wait on=1);
  
  subscribe set (id=1, provider=2, receiver = 3, forward=yes);
  sync(id=1);
! wait for event (origin=all, confirmed=3, 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);