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

Modified Files:
	run_test.sh 
Log Message:
Autovacuum changes recently made to 2.0 branch
test tool changes recently made to 2.0 branch


Index: run_test.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/run_test.sh,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** run_test.sh	11 Jun 2009 19:03:45 -0000	1.28
--- run_test.sh	21 Jul 2009 21:18:43 -0000	1.29
***************
*** 113,117 ****
  	node=1
          while : ; do
! 	  SLON_BIN_PATH=$PGBINDIR1 SLON_CONF=${mktmp}/slon-conf.${node} $SLTOOLDIR/start_slon.sh stop
            if [ ${node} -ge ${NUMNODES} ]; then
              break;
--- 113,117 ----
  	node=1
          while : ; do
! 	  SLON_BUILD=$PGBINDIR SLON_CONF=${mktmp}/slon-conf.${node} $SLTOOLDIR/start_slon.sh stop
            if [ ${node} -ge ${NUMNODES} ]; then
              break;
***************
*** 250,256 ****
  	if [ -n "${db}" -a "${host}" -a "${user}" ]; then
  	  status "creating origin DB: $user -h $host -U $user -p $port $db"
!   	  $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING $db 1> ${mktmp}/createdb.${originnode} 2> ${mktmp}/createdb.${originnode}
  	  if [ $? -ne 0 ]; then	   
! 	    err 3 "An error occurred trying to $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING $db, ${mktmp}/createdb.${originnode} for details"
  	  fi
  	else
--- 250,256 ----
  	if [ -n "${db}" -a "${host}" -a "${user}" ]; then
  	  status "creating origin DB: $user -h $host -U $user -p $port $db"
!   	  $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING -T template0 $db 1> ${mktmp}/createdb.${originnode} 2> ${mktmp}/createdb.${originnode}
  	  if [ $? -ne 0 ]; then	   
! 	    err 3 "An error occurred trying to $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING -T template0 $db, ${mktmp}/createdb.${originnode} for details"
  	  fi
  	else
***************
*** 290,298 ****
                if [ ${node} -ne ${originnode} ]; then
  		status "creating subscriber ${node} DB: $user -h $host -U $user -p $port $db"
! 	        $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING $db 1> ${mktmp}/createdb.${node} 2> ${mktmp}/createdb.${node}
  		status "add plpgsql to subscriber"
  		$pgbindir/createlang -h $host -U $user -p $port plpgsql $db
  		status "loading subscriber ${node} DB from $odb"
! 	        $opgbindir/pg_dump -s  -h $ohost -U $ouser -p $oport $odb | $pgbindir/psql -h $host -p $port $db $user 1> ${mktmp}/init_schema.sql.${node} 2> ${mktmp}/init_schema.sql.${node}
  		status "done"
                fi
--- 290,298 ----
                if [ ${node} -ne ${originnode} ]; then
  		status "creating subscriber ${node} DB: $user -h $host -U $user -p $port $db"
! 	        $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING -T template0 $db 1> ${mktmp}/createdb.${node} 2> ${mktmp}/createdb.${node}
  		status "add plpgsql to subscriber"
  		$pgbindir/createlang -h $host -U $user -p $port plpgsql $db
  		status "loading subscriber ${node} DB from $odb"
! 	        $opgbindir/pg_dump -h $ohost -U $ouser -p $oport $odb | $pgbindir/psql -h $host -p $port $db $user 1> ${mktmp}/init_schema.sql.${node} 2> ${mktmp}/init_schema.sql.${node}
  		status "done"
                fi
***************
*** 528,536 ****
    build_slonconf ${originnode} "${conninfo}"
    slonparms=" -f ${mktmp}/slon-conf.${originnode} "
!   status "launching originnode"
!   SLON_BIN_PATH=${opgbindir} SLON_CONF=${mktmp}/slon-conf.${originnode}  SLON_LOG=$mktmp/slon_log.${originnode} $SLTOOLDIR/start_slon.sh start
  
    sleep 1
!   SLPID=`SLON_BIN_PATH=${opgbindir} SLON_CONF=${mktmp}/slon-conf.${originnode} $SLTOOLDIR/start_slon.sh status | grep "Slon running as PID:"`
    if [ -z "${SLPID}" ]; then
        echo "SLPID: ${SLPID}"
--- 528,536 ----
    build_slonconf ${originnode} "${conninfo}"
    slonparms=" -f ${mktmp}/slon-conf.${originnode} "
!   status "launching originnode - PGBINDIR=${PGBINDIR}"
!   SLON_BUILD=${PGBINDIR} SLON_CONF=${mktmp}/slon-conf.${originnode} SLON_LOG=$mktmp/slon_log.${originnode} $SLTOOLDIR/start_slon.sh start
  
    sleep 1
!   SLPID=`SLON_BUILD=$PGBINDIR SLON_CONF=${mktmp}/slon-conf.${originnode} $SLTOOLDIR/start_slon.sh status | grep "Slon running as PID:"`
    if [ -z "${SLPID}" ]; then
        echo "SLPID: ${SLPID}"
***************
*** 584,591 ****
  	build_slonconf ${node} "${conninfo}"
  	status "launching slon"
! 	SLON_BIN_PATH=$pgbindir SLON_CONF=${CONFFILE} SLON_LOG=$mktmp/slon_log.${node} $SLTOOLDIR/start_slon.sh start
  	sleep 1
  	
! 	SLPID=`SLON_BIN_PATH=${pgbindir} SLON_CONF=${mktmp}/slon-conf.${node} $SLTOOLDIR/start_slon.sh status | grep "Slon running as PID:"`
  	if [ -z "${SLPID}" ]; then
  	    echo "SLPID: ${SLPID}"
--- 584,591 ----
  	build_slonconf ${node} "${conninfo}"
  	status "launching slon"
! 	SLON_BUILD=$PGBINDIR SLON_CONF=${CONFFILE} SLON_LOG=$mktmp/slon_log.${node} $SLTOOLDIR/start_slon.sh start
  	sleep 1
  	
! 	SLPID=`SLON_BUILD=${PGBINDIR} SLON_CONF=${mktmp}/slon-conf.${node} $SLTOOLDIR/start_slon.sh status | grep "Slon running as PID:"`
  	if [ -z "${SLPID}" ]; then
  	    echo "SLPID: ${SLPID}"