From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Wed, 2 Nov 2011 11:54:03 +0000 (+0000)
Subject: Do not report error in missing credentials before trying to generate new ones.
X-Git-Tag: glite-px-myproxy-yaim_R_4_1_5_1~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=5698dd658576573d60a7d969310ec0765408a39b;p=jra1mw.git

Do not report error in missing credentials before trying to generate new ones.
---

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