Mon Jan 9 12:12:17 PST 2006
- Previous message: [Slony1-commit] By cbbrowne: slony1_dump.sh 1.
- Next message: [Slony1-commit] By cbbrowne: Fixes to test scripts - per Seneca Cunningham Seneca
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
Fixes to test scripts - per Seneca Cunningham
Seneca located numerous instances where tests' code needed to specify port
numbers in order to allow use of multiple backends.
Tags:
----
REL_1_1_STABLE
Modified Files:
--------------
slony1-engine/tests:
run_test.sh (r1.5.2.3 -> r1.5.2.4)
slony1-engine/tests/testddl:
generate_dml.sh (r1.1.2.2 -> r1.1.2.3)
slony1-engine/tests/testschemanames:
generate_dml.sh (r1.2.2.1 -> r1.2.2.2)
slony1-engine/tests/testseqnames:
generate_dml.sh (r1.2.2.1 -> r1.2.2.2)
slony1-engine/tests/testtabnames:
generate_dml.sh (r1.2.2.1 -> r1.2.2.2)
slony1-engine/tests/testutf8:
generate_dml.sh (r1.2.2.1 -> r1.2.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.3
retrieving revision 1.5.2.4
diff -Ltests/run_test.sh -Ltests/run_test.sh -u -w -r1.5.2.3 -r1.5.2.4
--- tests/run_test.sh
+++ tests/run_test.sh
@@ -254,8 +254,8 @@
status "done"
}
-create_subscribers()
-{
+create_subscriber () {
+ alias=$1
originnode=${ORIGINNODE:-"1"}
eval odb=\$DB${originnode}
eval ohost=\$HOST${originnode}
@@ -263,17 +263,12 @@
eval opgbindir=\$PGBINDIR${originnode}
eval oport=\$PORT${originnode}
- if [ -n "${odb}" -a "${ohost}" -a "${ouser}" ]; then
- alias=1
- while : ; do
eval db=\$DB${alias}
eval host=\$HOST${alias}
eval user=\$USER${alias}
eval pgbindir=\$PGBINDIR${alias}
eval port=\$PORT${alias}
- if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
- if [ ${alias} -ne ${originnode} ]; then
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"
@@ -281,6 +276,23 @@
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"
+}
+
+create_subscribers()
+{
+ originnode=${ORIGINNODE:-"1"}
+ eval odb=\$DB${originnode}
+ eval ohost=\$HOST${originnode}
+ eval ouser=\$USER${originnode}
+ eval opgbindir=\$PGBINDIR${originnode}
+ eval oport=\$PORT${originnode}
+
+ if [ -n "${odb}" -a "${ohost}" -a "${ouser}" ]; then
+ alias=1
+ while : ; do
+ if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
+ if [ ${alias} -ne ${originnode} ]; then
+ create_subscriber ${alias}
fi
if [ ${alias} -ge ${NUMNODES} ]; then
break;
@@ -674,11 +686,11 @@
diff_db
-stop_processes
+# stop_processes
-status "waiting for slons to die"
-sleep 5
-status "done"
+# status "waiting for slons to die"
+# sleep 5
+# status "done"
-drop_databases
-cleanup
+# drop_databases
+# cleanup
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testddl/generate_dml.sh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Ltests/testddl/generate_dml.sh -Ltests/testddl/generate_dml.sh -u -w -r1.1.2.2 -r1.1.2.3
--- tests/testddl/generate_dml.sh
+++ tests/testddl/generate_dml.sh
@@ -65,10 +65,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 -U $user -d $db < $mktmp/generate.data 1> $LOG 2> $LOG
+ $pgbindir/psql -h $host -p $port -U $user -d $db < $mktmp/generate.data 1> $LOG 2> $LOG
if [ $? -ne 0 ]; then
warn 3 "do_initdata failed, see $mktmp/initdata.log for details"
fi
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testschemanames/generate_dml.sh,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -Ltests/testschemanames/generate_dml.sh -Ltests/testschemanames/generate_dml.sh -u -w -r1.2.2.1 -r1.2.2.2
--- tests/testschemanames/generate_dml.sh
+++ tests/testschemanames/generate_dml.sh
@@ -66,10 +66,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
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testseqnames/generate_dml.sh,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -Ltests/testseqnames/generate_dml.sh -Ltests/testseqnames/generate_dml.sh -u -w -r1.2.2.1 -r1.2.2.2
--- tests/testseqnames/generate_dml.sh
+++ tests/testseqnames/generate_dml.sh
@@ -64,10 +64,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
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testtabnames/generate_dml.sh,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -Ltests/testtabnames/generate_dml.sh -Ltests/testtabnames/generate_dml.sh -u -w -r1.2.2.1 -r1.2.2.2
--- tests/testtabnames/generate_dml.sh
+++ tests/testtabnames/generate_dml.sh
@@ -65,10 +65,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
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testutf8/generate_dml.sh,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -Ltests/testutf8/generate_dml.sh -Ltests/testutf8/generate_dml.sh -u -w -r1.2.2.1 -r1.2.2.2
--- tests/testutf8/generate_dml.sh
+++ tests/testutf8/generate_dml.sh
@@ -68,10 +68,11 @@
eval db=\$DB${originnode}
eval host=\$HOST${originnode}
eval user=\$USER${originnode}
+ eval port=\$PORT${originnode}
generate_initdata
launch_poll
status "loading data from $mktmp/generate.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
- Previous message: [Slony1-commit] By cbbrowne: slony1_dump.sh 1.
- Next message: [Slony1-commit] By cbbrowne: Fixes to test scripts - per Seneca Cunningham Seneca
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list