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

Modified Files:
	run_test.sh 
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: run_test.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/run_test.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** run_test.sh	17 Sep 2007 22:03:33 -0000	1.17
--- run_test.sh	21 Sep 2007 21:53:40 -0000	1.18
***************
*** 132,136 ****
  	  eval cluster=\$CLUSTER${node}
  	  if [ -n "${cluster}" ]; then
! 	    echo "CLUSTER NAME = ${cluster};" > $mktmp/slonik.script
  	    if [ ${node} -ge ${NUMCLUSTERS} ]; then
  	      break;
--- 132,136 ----
  	  eval cluster=\$CLUSTER${node}
  	  if [ -n "${cluster}" ]; then
! 	    echo "CLUSTER NAME = ${cluster};" > $mktmp/slonik.preamble
  	    if [ ${node} -ge ${NUMCLUSTERS} ]; then
  	      break;
***************
*** 150,157 ****
  	  eval user=\$USER${node}
  	  eval port=\$PORT${node}
  	
  	  if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
  	    conninfo="dbname=${db} host=${host} user=${user} port=${port}"
! 	    echo "NODE ${node} ADMIN CONNINFO = '${conninfo}';" >> $mktmp/slonik.script
  	    if [ ${node} -ge ${NUMNODES} ]; then
  	      break;
--- 150,158 ----
  	  eval user=\$USER${node}
  	  eval port=\$PORT${node}
+ 	  echo "define node${node} ${node};" >> $mktmp/slonik.preamble
  	
  	  if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
  	    conninfo="dbname=${db} host=${host} user=${user} port=${port}"
! 	    echo "NODE ${node} ADMIN CONNINFO = '${conninfo}';" >> $mktmp/slonik.preamble
  	    if [ ${node} -ge ${NUMNODES} ]; then
  	      break;
***************
*** 163,166 ****
--- 164,168 ----
  	  fi
  	done
+ 	echo "include <${mktmp}/slonik.preamble>;" > $mktmp/slonik.script
  }
  
***************
*** 188,192 ****
              status "Node ${node} is a log shipping node - no need for STORE NODE"
            else
!             echo "STORE NODE (id=${node}, comment='node ${node}');" >> $mktmp/slonik.script
           fi
          fi
--- 190,194 ----
              status "Node ${node} is a log shipping node - no need for STORE NODE"
            else
!             echo "STORE NODE (id=@node${node}, comment='node ${node}');" >> $mktmp/slonik.script
           fi
          fi
***************
*** 229,233 ****
                   status "log shipping between nodes(${i}/${j}) - ls(${logship}/${blogship}) - omit STORE PATH"
               else
! 	    echo "STORE PATH (SERVER=${i}, CLIENT=${j}, CONNINFO='dbname=${db} host=${host} user=${buser} port=${port}');" >> $mktmp/slonik.script
               fi
            else
--- 231,235 ----
                   status "log shipping between nodes(${i}/${j}) - ls(${logship}/${blogship}) - omit STORE PATH"
               else
! 	    echo "STORE PATH (SERVER=@node${i}, CLIENT=@node${j}, CONNINFO='dbname=${db} host=${host} user=${buser} port=${port}');" >> $mktmp/slonik.script
               fi
            else