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

Modified Files:
	init_add_tables.ik init_create_set.ik init_subscribe_set.ik 
Log Message:
Revise NG tests to exercise Slonik keywords DEFINE and INCLUDE:
- All tests now 'include<$tmp/slonik.preamble>;' to draw in cluster info
  which includes a DEFINE for each node

- testlistenpath has been changed so that all Slonik references to nodes
  use @node${number} to reference a DEFINEd value

This somewhat obsolesces Duct Tape Test #7


Index: init_create_set.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testlistenpaths/init_create_set.ik,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** init_create_set.ik	21 Sep 2007 21:34:56 -0000	1.1
--- init_create_set.ik	21 Sep 2007 21:53:40 -0000	1.2
***************
*** 1,2 ****
! create set (id=1, origin=1, comment='set subscribed by nodes 1, 3');
  
--- 1,2 ----
! create set (id=1, origin=@node1, comment='set subscribed by nodes 1, 3');
  

Index: init_subscribe_set.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testlistenpaths/init_subscribe_set.ik,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** init_subscribe_set.ik	21 Sep 2007 21:34:56 -0000	1.1
--- init_subscribe_set.ik	21 Sep 2007 21:53:40 -0000	1.2
***************
*** 1,9 ****
! subscribe set (id = 1, provider = 1, receiver = 3, forward = no);
! create set (id=2, origin=2, comment='set subscribed by nodes 2,4,5');
  
  
! set add table (id=1, set id=2, origin=2, fully qualified name = 'public.table1', comment='accounts table');
! set add table (id=2, set id=2, origin=2, fully qualified name = 'public.table2', key='table2_id_key');
! set add table (id=4, set id=2, origin=2, fully qualified name = 'public.table4', comment='a table of many types');
! subscribe set (id = 2, provider = 2, receiver = 4, forward = no);
! subscribe set (id = 2, provider = 2, receiver = 5, forward = no);
--- 1,9 ----
! subscribe set (id = 1, provider = @node1, receiver = @node3, forward = no);
! create set (id=2, origin=@node2, comment='set subscribed by nodes 2,4,5');
  
  
! set add table (id=1, set id=2, origin=@node2, fully qualified name = 'public.table1', comment='accounts table');
! set add table (id=2, set id=2, origin=@node2, fully qualified name = 'public.table2', key='table2_id_key');
! set add table (id=4, set id=2, origin=@node2, fully qualified name = 'public.table4', comment='a table of many types');
! subscribe set (id = 2, provider = @node2, receiver = @node4, forward = no);
! subscribe set (id = 2, provider = @node2, receiver = @node5, forward = no);

Index: init_add_tables.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testlistenpaths/init_add_tables.ik,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** init_add_tables.ik	21 Sep 2007 21:34:56 -0000	1.1
--- init_add_tables.ik	21 Sep 2007 21:53:40 -0000	1.2
***************
*** 1,7 ****
! set add table (id=1, set id=1, origin=1, fully qualified name = 'public.table1', comment='accounts table');
! set add table (id=2, set id=1, origin=1, fully qualified name = 'public.table2', key='table2_id_key');
  
  try {
!    set add table (id=3, set id=1, origin=1, fully qualified name = 'public.table3', key = 'no_good_candidate_pk', comment='bad table - table 3');
  } on error {
     echo 'Tried to replicate table3 with no good candidate PK - rejected';
--- 1,7 ----
! set add table (id=1, set id=1, origin=@node1, fully qualified name = 'public.table1', comment='accounts table');
! set add table (id=2, set id=1, origin=@node1, fully qualified name = 'public.table2', key='table2_id_key');
  
  try {
!    set add table (id=3, set id=1, origin=@node1, fully qualified name = 'public.table3', key = 'no_good_candidate_pk', comment='bad table - table 3');
  } on error {
     echo 'Tried to replicate table3 with no good candidate PK - rejected';
***************
*** 11,13 ****
  }
  
! set add table (id=4, set id=1, origin=1, fully qualified name = 'public.table4', comment='a table of many types');
\ No newline at end of file
--- 11,13 ----
  }
  
! set add table (id=4, set id=1, origin=@node1, fully qualified name = 'public.table4', comment='a table of many types');
\ No newline at end of file