From c39ef07c0aefa57e0453ca2357789ac1895b1adb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Thu, 1 Mar 2012 14:17:10 +0000 Subject: [PATCH] Always regeneratre lsc + prepareation for a new test --- org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh index ea1066a..f617037 100755 --- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh +++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh @@ -408,7 +408,7 @@ EOF if [ -f $vomsfile ]; then VOMSHOSTONLY=`cat $vomsfile | awk '{ print $2 }' | sed 's/"//g'` VONAME=`cat $vomsfile | awk '{ print $1 }' | sed 's/"//g'` - if [ ! -f /etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc ]; then +# if [ ! -f /etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc ]; then VOMSHOST=`cat $vomsfile | awk '{ print $2 ":" $3; }' | sed 's/"//g'` openssl s_client -connect $VOMSHOST 2>&1 | grep "^depth" | sed 's/^depth=//' | sort -r -n > $VOMSHOSTONLY.$$.DNs.txt VOMSCERT=`tail -n 1 $VOMSHOSTONLY.$$.DNs.txt | sed -r 's/^[0-9]+\s+//'` @@ -420,9 +420,9 @@ EOF printf "Generated /etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc\n$NL" rm $VOMSHOSTONLY.$$.DNs.txt - else - printf "/etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc already exists\n$NL" - fi +# else +# printf "/etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc already exists\n$NL" +# fi # cat /etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc | sed "s/\$/$NL/" fi @@ -446,6 +446,9 @@ EOF fi fi + printf "Test listing of VOMS attributes (Regression test for bug #92077)\n" + curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --silent https://$(hostname -f)/test.cgi + else printf "No proxy certificate" test_skipped -- 1.8.2.3