From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 24 Apr 2010 08:20:20 +0000 (+0000)
Subject: Fix the VOMS proxy check.
X-Git-Tag: glite-security-gsoap-plugin_R_2_1_2_1~43
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=1577d5eefb80037410acc1048f294e4489a838ea;p=jra1mw.git

Fix the VOMS proxy check.
Tune outputs (information even when jobs are not purged).
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-wild.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-wild.sh
index dceb60b..9460d9b 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-wild.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-wild.sh
@@ -108,8 +108,8 @@ done
 
 
 N=${N:-2}
+voms-proxy-info >/dev/null || fatal 2 "No VOMS proxy certificate!"
 if test -z "$VO"; then
-	voms-proxy-info >/dev/null || fatal 2 "No VOMS proxy certificate!"
 	VO=`voms-proxy-info --vo`
 fi
 if test -z "$VO"; then
@@ -500,11 +500,18 @@ for ((i=0; i<${#job_cats[*]}; i++)); do
 done
 
 
+# -- result data --
+echo -n "[wild] outputs: "
+find "jobOutput.$$" -type f
+echo -en "${lf}"
+
+
 # -- only for done jobs: wait for cleared --
 
 n=${#jobs[*]}
 quit=0
 cleared_fail=0
+echo -en "[wild] waiting for cleared states...${lf}"
 while test $quit -eq 0; do
 	quit=1
 	for ((i=0;i<n;i++)); do
@@ -531,10 +538,6 @@ else
 	fail=$TEST_ERROR
 fi
 
-echo -n "[wild] outputs: "
-find "jobOutput.$$" -type f
-echo -en "${lf}"
-
 test_end
 }