test fixes.

diff --git a/tests/cascade/init.sh b/tests/cascade/init.sh
index 19df887a900eb94b4a10fd72cfe67b02dc8ffa0b..f77a7260738db676ddab15e08c5d75d1ee13ee72 100755 (executable)
--- a/tests/cascade/init.sh
+++ b/tests/cascade/init.sh
@@ -2,6 +2,8 @@
 
 . ../env.sh
 
+mkdir -p log pid
+
 dropdb db1
 dropdb db2
 dropdb db3
@@ -10,9 +12,9 @@ createdb db1
 createdb db2
 createdb db3
 
-pgqadm.py conf/ticker_db1.ini install
-pgqadm.py conf/ticker_db2.ini install
-pgqadm.py conf/ticker_db3.ini install
+pgqadm conf/ticker_db1.ini install
+pgqadm conf/ticker_db2.ini install
+pgqadm conf/ticker_db3.ini install
 
 lst="part1 part2 part3 part4 full1 full2 full3 full4"
 

diff --git a/tests/cascade/regen.sh b/tests/cascade/regen.sh
index c929a6cacbaba47a6622787f790dc6a9f984e27b..3ed399ad8d0e3fcab14e9756996340b6e1072ce7 100755 (executable)
--- a/tests/cascade/regen.sh
+++ b/tests/cascade/regen.sh
@@ -32,7 +32,7 @@ for db in db1 db2 db3; do
   cleardb $db
 done
 
-run ./plainconsumer -s conf/nop_consumer.ini
+run ./plainconsumer.py -s conf/nop_consumer.ini
 
 rm -f log/*.log
 
@@ -61,13 +61,13 @@ run setadm $v --worker=node3_worker conf/setadm.ini create-branch node3 'dbname=
 run setadm $v conf/setadm.ini status
 
 #echo " # plainconsumer # "
-run ./plainconsumer $v conf/nop_consumer.ini --register --provider='dbname=db1'
-run ./plainconsumer $v -d conf/nop_consumer.ini
+run ./plainconsumer.py $v conf/nop_consumer.ini --register --provider='dbname=db1'
+run ./plainconsumer.py $v -d conf/nop_consumer.ini
 
 #echo " # plainworker # "
-run ./plainworker $v -d conf/worker_db1.ini
-run ./plainworker $v -d conf/worker_db2.ini
-run ./plainworker $v -d conf/worker_db3.ini
+run ./plainworker.py $v -d conf/worker_db1.ini
+run ./plainworker.py $v -d conf/worker_db2.ini
+run ./plainworker.py $v -d conf/worker_db3.ini
 
 
 #echo " # insert_event() # "

diff --git a/tests/cascade/status.sh b/tests/cascade/status.sh
index 9ff9d8d2b4d3f760e8c3bd634d0f06a2fc31d98e..93b85a7c1f0f8e114a36edba83d95beac5c2150a 100755 (executable)
--- a/tests/cascade/status.sh
+++ b/tests/cascade/status.sh
@@ -2,10 +2,10 @@
 
 . ../env.sh
 
-pgqadm.py conf/ticker_db1.ini status
-pgqadm.py conf/ticker_db2.ini status 
-pgqadm.py conf/ticker_db3.ini status
+pgqadm conf/ticker_db1.ini status
+pgqadm conf/ticker_db2.ini status 
+pgqadm conf/ticker_db3.ini status
 
-setadm.py -v conf/setadm.ini status
+setadm -v conf/setadm.ini status
 
 

diff --git a/tests/env.sh b/tests/env.sh
index 68e15dce582f9850dc7f3dc6641be2adcbb77f77..5bedf6754506a2e844c23fcfa2a955200db19770 100644 (file)
--- a/tests/env.sh
+++ b/tests/env.sh
@@ -1,6 +1,12 @@
 
-pfx=/opt/apps/skytools3
-pyver=2.5
+for dir in . .. ../..
+do
+ config=$dir/config.mak
+ test -f $config && break
+done
+
+pfx=`grep ^prefix $config | awk '{ print $3}'`
+pyver=`python -V 2>&1 | sed 's/Python \([0-9]*.[0-9]*\).*/\1/'`
 PYTHONPATH=$pfx/lib/python$pyver/site-packages:$PYTHONPATH
 PATH=$pfx/bin:$PATH
 #PYTHONPATH=../../python:$PYTHONPATH
@@ -8,4 +14,3 @@ PATH=$pfx/bin:$PATH
 #LD_LIBRARY_PATH=/opt/apps/py26/lib:$LD_LIBRARY_PATH
 #PATH=/opt/apps/py26/bin:$PATH
 export PYTHONPATH PATH LD_LIBRARY_PATH PATH
-