From 5698dd658576573d60a7d969310ec0765408a39b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Wed, 2 Nov 2011 11:54:03 +0000 Subject: [PATCH] Do not report error in missing credentials before trying to generate new ones. --- org.glite.testsuites.ctb/LB/tests/lb-common.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh index 776429b..4dfc806 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh @@ -132,12 +132,18 @@ function check_credentials_and_generate_proxy() { check_credentials if [ $? != 0 ]; then - test_failed ./lb-generate-fake-proxy.sh if [ $? != 0 ]; then + test_failed print_error "Proxy not created - process failed" return 2 fi + check_credentials + if [ $? != 0 ]; then + test_failed + print_error "Credentials still not passing check" + return 2 + fi else test_done fi @@ -288,11 +294,11 @@ function check_credentials() timeleft=`${my_GRIDPROXYINFO} 2>/dev/null | ${SYS_GREP} -E "^timeleft" | ${SYS_SED} "s/timeleft\s*:\s//"` if [ "$timeleft" = "" ]; then - print_error "No credentials" + printf "... No credentials... " return 1 fi if [ "$timeleft" = "0:00:00" ]; then - print_error "Credentials expired" + printf "... Credentials expired... " return 1 fi return 0 -- 1.8.2.3