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

Modified Files:
	gen_ddl_slonik.sh init_subscribe_set.ik schema.diff 
Log Message:
Fixes to "merge set" test


Index: init_subscribe_set.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testmergeset/init_subscribe_set.ik,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** init_subscribe_set.ik	25 Sep 2007 18:25:11 -0000	1.1
--- init_subscribe_set.ik	22 Oct 2007 18:45:02 -0000	1.2
***************
*** 1,6 ****
  subscribe set (id = 1, provider = 1, receiver = 2, forward = yes);
! wait for event(origin = all, confirmed = 2, wait on=1);
  subscribe set (id = 1, provider = 1, receiver = 3, forward = no);
! wait for event(origin = all, confirmed = 3, wait on=1);
  subscribe set (id = 1, provider = 2, receiver = 4, forward = no);
! wait for event(origin = all, confirmed = 4, wait on=1);
--- 1,9 ----
  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 = no);
! sync (id=1);
! wait for event (origin = all, confirmed = 3, wait on = 1);
  subscribe set (id = 1, provider = 2, receiver = 4, forward = no);
! sync (id=1);
! wait for event (origin = all, confirmed = 4, wait on = 1);

Index: gen_ddl_slonik.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testmergeset/gen_ddl_slonik.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gen_ddl_slonik.sh	25 Sep 2007 18:25:11 -0000	1.1
--- gen_ddl_slonik.sh	22 Oct 2007 18:45:02 -0000	1.2
***************
*** 15,30 ****
    subscribe set (id=999, provider=1, receiver=2, forward = yes);
    sync (id=1);
!   wait for event (origin=1, confirmed=all, wait on=2);
    subscribe set (id=999, provider=1, receiver=3, forward = no);
    sync (id=1);
!   wait for event (origin=1, confirmed=all, wait on=3);
    subscribe set (id=999, provider=2, receiver=4, forward = no);
!   sync (id=1);
!   wait for event (origin=1, confirmed=all, wait on=4);
!   sync (id=1);
!   sleep (seconds = 5);
!   wait for event (origin=1, confirmed=all, wait on=4);
!   sync (id=1);
!   wait for event (origin=1, confirmed=all, wait on=4);
    merge set (ID = 1, ADD ID = 999, ORIGIN = 1 );
  
--- 15,26 ----
    subscribe set (id=999, provider=1, receiver=2, forward = yes);
    sync (id=1);
!   wait for event (origin=1, confirmed=2, wait on=1);
    subscribe set (id=999, provider=1, receiver=3, forward = no);
    sync (id=1);
!   wait for event (origin=1, confirmed=3, wait on=1);
    subscribe set (id=999, provider=2, receiver=4, forward = no);
!   sync (id=2);
!   wait for event (origin=2, confirmed=4, wait on=2);
!   sleep(seconds=5);
    merge set (ID = 1, ADD ID = 999, ORIGIN = 1 );
  

Index: schema.diff
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testmergeset/schema.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** schema.diff	25 Sep 2007 18:25:11 -0000	1.1
--- schema.diff	22 Oct 2007 18:45:02 -0000	1.2
***************
*** 4,6 ****
  select '2006_2', * from sales_txns_2006_2 order by id
  select '2006_3', * from sales_txns_2006_3 order by id
- select '2006_4', * from sales_txns_2006_4 order by id
--- 4,5 ----