Do not report error in missing credentials before trying to generate new ones.
authorZdeněk Šustr <sustr4@cesnet.cz>
Wed, 2 Nov 2011 11:54:03 +0000 (11:54 +0000)
committerZdeněk Šustr <sustr4@cesnet.cz>
Wed, 2 Nov 2011 11:54:03 +0000 (11:54 +0000)
org.glite.testsuites.ctb/LB/tests/lb-common.sh

index 776429b..4dfc806 100755 (executable)
@@ -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