Log Message:
-----------
Test script fixes - per Seneca Cunningham

Seneca noticed that some of the tests don't work out well if you split
things across multiple backends. The tests generally work fine when run
against multiple databases on the same backend, but splitting across
multiple backends/hosts didn't work as expected. Evidently, some of the
setup didn't reference the port number; added that in here and there...

Tags:
----
REL_1_1_STABLE

Modified Files:
--------------
    slony1-engine/tests:
        run_test.sh (r1.5.2.2 -> r1.5.2.3)
    slony1-engine/tests/test1:
        generate_dml.sh (r1.4.2.1 -> r1.4.2.2)

-------------- next part --------------
Index: run_test.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/run_test.sh,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -Ltests/run_test.sh -Ltests/run_test.sh -u -w -r1.5.2.2 -r1.5.2.3
--- tests/run_test.sh
+++ tests/run_test.sh
@@ -142,9 +142,10 @@
 	  eval db=\$DB${alias}
 	  eval host=\$HOST${alias}
 	  eval user=\$USER${alias}
+	  eval port=\$PORT${alias}
 	
-	  if [ -n "${db}" -a "${host}" -a "${user}" ]; then
-	    conninfo="dbname=${db} host=${host} user=${user}"
+	  if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
+	    conninfo="dbname=${db} host=${host} user=${user} port=${port}"
 	    echo "NODE ${alias} ADMIN CONNINFO = '${conninfo}';" >> $mktmp/slonik.script
 	    if [ ${alias} -ge ${NUMNODES} ]; then
 	      break;
@@ -276,7 +277,7 @@
 		status "creating subscriber ${alias} 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.${alias} 2> ${mktmp}/createdb.${alias}
 		status "add plpgsql to subscriber"
-		$pgbindir/createlang -h $ohost -U $ouser -p $oport plpgsql $odb
+		$pgbindir/createlang -h $host -U $user -p $port plpgsql $db
 		status "loading subscriber ${alias} 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.${alias} 2> ${mktmp}/init_schema.sql.${alias}
 		status "done"
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/test1/generate_dml.sh,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -Ltests/test1/generate_dml.sh -Ltests/test1/generate_dml.sh -u -w -r1.4.2.1 -r1.4.2.2
--- tests/test1/generate_dml.sh
+++ tests/test1/generate_dml.sh
@@ -62,10 +62,11 @@
   eval db=\$DB${originnode}
    eval host=\$HOST${originnode}
   eval user=\$USER${originnode}
+  eval port=\$PORT${originnode}
   generate_initdata
   launch_poll
   status "loading data"
-  $pgbindir/psql -h $host -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
+  $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
   if [ $? -ne 0 ]; then
     warn 3 "do_initdata failed, see $mktmp/initdata.log for details"
   fi