automate harvester test

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh b/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh
index cf9a1ae..dad343b 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh
@@ -115,8 +115,21 @@ GLITE_USER=\$2
 LBTSTCOLS=\$3
 OUTPUT_OPT=\$4
 
+
 export LBTSTCOLS
 
+yum install -q -y postgresql postgresql-server
+/etc/init.d/postgresql start
+mv /var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/data/pg_hba.conf.orig
+cat >/var/lib/pgsql/data/pg_hba.conf <<EOF
+local all all trust
+host all all 127.0.0.1 ident sameuser
+host all all ::1/128 ident sameuser
+EOF
+/etc/init.d/postgresql reload
+createuser -U postgres -S -R -D rtm
+
+
 cd /tmp
 
 glite_id=\`id -u \$GLITE_USER\`
@@ -142,6 +155,7 @@ fi
 
 echo cd > arrange_lb_test_user.sh
 echo export LBTSTCOLS=\$LBTSTCOLS >> arrange_lb_test_user.sh
+echo 'export GLITE_MYSQL_ROOT_PASSWORD="[Edited]"' >> arrange_lb_test_user.sh
 echo mkdir LB_testing >> arrange_lb_test_user.sh
 echo cd LB_testing >> arrange_lb_test_user.sh
 echo cvs -d :pserver:anonymous@glite.cvs.cern.ch:/cvs/jra1mw co org.glite.testsuites.ctb/LB >> arrange_lb_test_user.sh
@@ -176,6 +190,7 @@ echo sh ./lb-test-sandbox-transfer.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
 echo sh ./lb-test-changeacl.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
 echo sh ./lb-test-statistics.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
 echo sh ./lb-test-threaded.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+echo sh ./lb-test-harvester.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
 echo perl ./lb-test-purge.pl --i-want-to-purge delwin.fi.muni.cz:9000 \$OUTPUT_OPT >> arrange_lb_test_user.sh
 echo echo ================== >> arrange_lb_test_user.sh
 echo echo "  TESTS END HERE" >> arrange_lb_test_user.sh

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh
index 40fb58c..6b914ff 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh
@@ -330,7 +330,7 @@ else
 
                        printf "Registering input SandBox collection...  "
 
-                        $LBREGSANDBOX --jobid $jobid --input --from http://users.machine/path/to/sandbox.file --to file://where/it/is/sandbox.file --sequence $seqcode -n 2 > sbtestjob.$$.out
+                        $LBREGSANDBOX --jobid $jobid --input --from http://users.machine/path/to/sandbox.file --to file://where/it/is/sandbox.file --sequence $seqcode -n 2 > sbtestjob.$$.out 2> sbtestjob.$$.err
 
                         isbjobid=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "GLITE_LB_ISB_JOBID" | ${SYS_SED} 's/GLITE_LB_ISB_JOBID=//' | ${SYS_SED} 's/"//g'`
                         isbseqcode=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "GLITE_LB_ISB_SEQUENCE" | ${SYS_SED} 's/GLITE_LB_ISB_SEQUENCE=//' | ${SYS_SED} 's/"//g'`
@@ -341,6 +341,7 @@ else
                        printf "Subjobs: " $isbsubjobid0 $isbsubjobid1
 
                         $SYS_RM sbtestjob.$$.out
+                        $SYS_RM sbtestjob.$$.err
 
                         if [ -z $isbjobid  ]; then
                                 test_failed