From c487b7160a00980ef18292762d7a13e7a5e8f9df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 27 Aug 2012 14:45:30 +0000 Subject: [PATCH] Update tests to work with newer HTML output too. --- org.glite.testsuites.ctb/LB/tests/lb-test-https.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh index f7b8dd9..9a18ac6 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh @@ -226,7 +226,7 @@ test_done fi printf "Checking for validity period (to distinguis from job listing)... " - $SYS_GREP -E "Valid until:[0-9 :-]+" https.$$.tmp > /dev/null 2> /dev/null + $SYS_GREP -E "Valid until:?[0-9 :-]+" https.$$.tmp > /dev/null 2> /dev/null if [ "$?" != "0" ]; then test_failed @@ -307,10 +307,10 @@ test_done if [ ! "$LineNO" = "0" ]; then test_done printf "Checking for items... " - for item in msg_brokers msg_prefixes + for item in 'msg_brokers|Messaging brokers' 'msg_prefixes|Messaging prefixes' do printf "$item... " - $SYS_GREP -E "$item.*=" https.$$.tmp > /dev/null + $SYS_GREP -E "$item(.*=)?" https.$$.tmp > /dev/null if [ "$?" = "0" ]; then test_done else -- 1.8.2.3