From 4d8178d3f4449353e59693e03ba9a7898af4957b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Tue, 28 Feb 2012 15:23:42 +0000 Subject: [PATCH] - No need to specify notify receive timout (enforced externally) - Check for validity period in notification listings to distinguish from job listing --- org.glite.testsuites.ctb/LB/tests/lb-test-https.sh | 10 ++++++++++ org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) 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 9a1b920..236041c 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh @@ -225,6 +225,16 @@ test_done 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 + + if [ "$?" != "0" ]; then + test_failed + print_error "Validity period inot listed" + else + test_done + fi + $SYS_RM https.$$.tmp fi diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh index a4ae748..44cbfd7 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh @@ -145,7 +145,7 @@ else test_done #Start listening for notifications - ${LBNOTIFY} receive -i 10 ${notifid} > $$_notifications.txt & + ${LBNOTIFY} receive ${notifid} > $$_notifications.txt & recpid=$! disown $recpid -- 1.8.2.3