From 7e2eb69cb447f6b823cacb8ddd820d4bdd026149 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Sun, 27 Feb 2011 08:12:02 +0000 Subject: [PATCH] - Skip SB collection in lower versions - More verbosity vor skipped tests --- .../LB/tests/lb-test-changeacl.sh | 3 +- .../LB/tests/lb-test-sandbox-transfer.sh | 622 +++++++++++---------- 2 files changed, 317 insertions(+), 308 deletions(-) diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-changeacl.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-changeacl.sh index 62b1b9d..3bd415e 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-test-changeacl.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-test-changeacl.sh @@ -134,8 +134,9 @@ while [ "$CONT" = "yes" ]; do fi test_done - printf "Testing Tags permissions " + printf "Testing Tags permissions... " if [ "$test_tag_acl" != "yes" ]; then + printf "Capability not detected..." test_skipped else test_done diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh index 6b914ff..d915d68 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh @@ -332,321 +332,329 @@ else $LBREGSANDBOX --jobid $jobid --input --from http://users.machine/path/to/sandbox.file --to file://where/it/is/sandbox.file --sequence $seqcode -n 2 > sbtestjob.$$.out 2> sbtestjob.$$.err - isbjobid=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "GLITE_LB_ISB_JOBID" | ${SYS_SED} 's/GLITE_LB_ISB_JOBID=//' | ${SYS_SED} 's/"//g'` - isbseqcode=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "GLITE_LB_ISB_SEQUENCE" | ${SYS_SED} 's/GLITE_LB_ISB_SEQUENCE=//' | ${SYS_SED} 's/"//g'` - seqcode=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "GLITE_WMS_SEQUENCE_CODE" | ${SYS_SED} 's/GLITE_WMS_SEQUENCE_CODE=//' | ${SYS_SED} 's/"//g'` - isbsubjobid0=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "EDG_WL_SUB_JOBID\[0\]" | ${SYS_SED} 's/EDG_WL_SUB_JOBID\[0\]=//' | ${SYS_SED} 's/"//g'` - isbsubjobid1=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "EDG_WL_SUB_JOBID\[1\]" | ${SYS_SED} 's/EDG_WL_SUB_JOBID\[1\]=//' | ${SYS_SED} 's/"//g'` - - printf "Subjobs: " $isbsubjobid0 $isbsubjobid1 - - $SYS_RM sbtestjob.$$.out - $SYS_RM sbtestjob.$$.err - - if [ -z $isbjobid ]; then - test_failed - print_error "Failed to register job" - else - printf "$isbjobid" - test_done - - # Check relations - - printf "Check ISB transfer JobID for computing job... " - isbjobidreported=`$LBJOBSTATUS $jobid | $SYS_GREP -m 1 "isb_transfer :" | ${SYS_AWK} '{print $3}'` - printf "$isbjobidreported" - - if [ "$isbjobidreported" = "$isbjobid" ]; then - test_done - else - test_failed - print_error "Not returned or no match" - fi - - printf "Check computing Job ID for ISB... " - jobidreported=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "ft_compute_job :" | ${SYS_AWK} '{print $3}'` - printf "$jobidreported" - - if [ "$jobidreported" = "$jobid" ]; then - test_done - else - test_failed - print_error "Not returned or no match" - fi - - printf "Check computing Job ID for subjob 0... " - jobidreported=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "ft_compute_job :" | ${SYS_AWK} '{print $3}'` - printf "$jobidreported" - - if [ "$jobidreported" = "$jobid" ]; then - test_done - else - test_failed - print_error "Not returned or no match" - fi - - printf "Check transfer Job ID for subjob 0... " - jobidreported=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "parent_job :" | ${SYS_AWK} '{print $3}'` - printf "$jobidreported" - - if [ "$jobidreported" = "$isbjobid" ]; then - test_done - else - test_failed - print_error "Not returned or no match" - fi - - - # Check states - - isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbjobid... $isbjobstate" - - if [ "${isbjobstate}" = "Submitted" ]; then - test_done - else - test_failed - print_error "'Submitted' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbsubjobid0... $isbjobstate" - - if [ "${isbjobstate}" = "Submitted" ]; then - test_done - else - test_failed - print_error "'Submitted' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbsubjobid1 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbsubjobid1... $isbjobstate" - - if [ "${isbjobstate}" = "Submitted" ]; then - test_done - else - test_failed - print_error "'Submitted' was expected" - fi - - # log START for subjob 1 - printf "Subjob 1 transfer starting... " - isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid1 --sequence $osbseqcode --event FileTransfer --result START` - - if [ -z $isbseqcode ]; then - test_failed - print_error "LogEvent failed" - else - test_done - fi - - # Check states - sleep 10 - - isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbjobid... $isbjobstate" - - if [ "${isbjobstate}" = "Running" ]; then - test_done - else - test_failed - print_error "'Running' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbsubjobid1 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbsubjobid1... $isbjobstate" - - if [ "${isbjobstate}" = "Running" ]; then - test_done - else - test_failed - print_error "'Running' was expected" - fi - - # log OK for subjob 1 - printf "Subjob 1 transfer ending... " - isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid1 --sequence $osbseqcode --event FileTransfer --result OK` - - if [ -z $isbseqcode ]; then - test_failed - print_error "LogEvent failed" - else - test_done - fi - - # Check states - sleep 10 - - isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbjobid... $isbjobstate" - - if [ "${isbjobstate}" = "Waiting" ]; then - test_done - else - test_failed - print_error "'Waiting' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbsubjobid1 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbsubjobid1... $isbjobstate" - - if [ "${isbjobstate}" = "Done" ]; then - test_done - else - test_failed - print_error "'Done' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbsubjobid1 | $SYS_GREP "done_code :" | ${SYS_AWK} '{print $3}'` - printf "Checking Done Code... $isbjobstate" - - if [ "${isbjobstate}" = "DONE_CODE_OK" ]; then - test_done - else - test_failed - print_error "'DONE_CODE_OK' was expected" - fi - - # log START for subjob 0 - printf "Subjob 0 transfer starting... " - isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid0 --sequence $osbseqcode --event FileTransfer --result START` - - if [ -z $isbseqcode ]; then - test_failed - print_error "LogEvent failed" - else - test_done - fi - - # Check states - sleep 10 - - isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbjobid... $isbjobstate" - - if [ "${isbjobstate}" = "Running" ]; then - test_done - else - test_failed - print_error "'Running' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbsubjobid0... $isbjobstate" - - if [ "${isbjobstate}" = "Running" ]; then - test_done - else - test_failed - print_error "'Running' was expected" - fi - - # log FAIL for subjob 0 - printf "Subjob 0 transfer ending... " - isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid0 --sequence $osbseqcode --event FileTransfer --result FAIL` - - if [ -z $isbseqcode ]; then - test_failed - print_error "LogEvent failed" - else - test_done - fi - - # Check states - sleep 10 - - isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbjobid... $isbjobstate" - - if [ "${isbjobstate}" = "Waiting" ]; then - test_done - else - test_failed - print_error "'Waiting' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbsubjobid0... $isbjobstate" - - if [ "${isbjobstate}" = "Done" ]; then - test_done - else - test_failed - print_error "'Done' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "done_code :" | ${SYS_AWK} '{print $3}'` - printf "Checking Done Code... $isbjobstate" - - if [ "${isbjobstate}" = "DONE_CODE_FAILED" ]; then - test_done - else - test_failed - print_error "'DONE_CODE_FAILED' was expected" - fi - - # START and OK subjob 0 - - printf "Subjob 0 starting and ending..." - isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid0 --sequence $osbseqcode --event FileTransfer --result START` - isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid0 --sequence $osbseqcode --event FileTransfer --result OK` - - # Check states - sleep 10 - - isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbjobid... $isbjobstate" - - if [ "${isbjobstate}" = "Done" ]; then - test_done - else - test_failed - print_error "'Done' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "done_code :" | ${SYS_AWK} '{print $3}'` - printf "Checking Done Code... $isbjobstate" - - if [ "${isbjobstate}" = "DONE_CODE_OK" ]; then - test_done - else - test_failed - print_error "'DONE_CODE_OK' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` - printf "Checking state of $isbsubjobid... $isbjobstate" - - if [ "${isbjobstate}" = "Done" ]; then - test_done - else - test_failed - print_error "'Done' was expected" - fi - - isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "done_code :" | ${SYS_AWK} '{print $3}'` - printf "Checking Done Code... $isbjobstate" - - if [ "${isbjobstate}" = "DONE_CODE_OK" ]; then - test_done - else - test_failed - print_error "'DONE_CODE_OK' was expected" - fi + $SYS_GREP "invalid option -- n" sbtestjob.$$.err > /dev/null + if [ ]; then + printf "SB collection: capability not detected..." + test_skipped + else - fi + isbjobid=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "GLITE_LB_ISB_JOBID" | ${SYS_SED} 's/GLITE_LB_ISB_JOBID=//' | ${SYS_SED} 's/"//g'` + isbseqcode=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "GLITE_LB_ISB_SEQUENCE" | ${SYS_SED} 's/GLITE_LB_ISB_SEQUENCE=//' | ${SYS_SED} 's/"//g'` + seqcode=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "GLITE_WMS_SEQUENCE_CODE" | ${SYS_SED} 's/GLITE_WMS_SEQUENCE_CODE=//' | ${SYS_SED} 's/"//g'` + isbsubjobid0=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "EDG_WL_SUB_JOBID\[0\]" | ${SYS_SED} 's/EDG_WL_SUB_JOBID\[0\]=//' | ${SYS_SED} 's/"//g'` + isbsubjobid1=`$SYS_CAT sbtestjob.$$.out | $SYS_GREP "EDG_WL_SUB_JOBID\[1\]" | ${SYS_SED} 's/EDG_WL_SUB_JOBID\[1\]=//' | ${SYS_SED} 's/"//g'` + + printf "Subjobs: " $isbsubjobid0 $isbsubjobid1 + + $SYS_RM sbtestjob.$$.out + + if [ -z $isbjobid ]; then + test_failed + print_error "Failed to register job" + else + printf "$isbjobid" + test_done + + # Check relations + + printf "Check ISB transfer JobID for computing job... " + isbjobidreported=`$LBJOBSTATUS $jobid | $SYS_GREP -m 1 "isb_transfer :" | ${SYS_AWK} '{print $3}'` + printf "$isbjobidreported" + + if [ "$isbjobidreported" = "$isbjobid" ]; then + test_done + else + test_failed + print_error "Not returned or no match" + fi + + printf "Check computing Job ID for ISB... " + jobidreported=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "ft_compute_job :" | ${SYS_AWK} '{print $3}'` + printf "$jobidreported" + + if [ "$jobidreported" = "$jobid" ]; then + test_done + else + test_failed + print_error "Not returned or no match" + fi + + printf "Check computing Job ID for subjob 0... " + jobidreported=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "ft_compute_job :" | ${SYS_AWK} '{print $3}'` + printf "$jobidreported" + + if [ "$jobidreported" = "$jobid" ]; then + test_done + else + test_failed + print_error "Not returned or no match" + fi + + printf "Check transfer Job ID for subjob 0... " + jobidreported=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "parent_job :" | ${SYS_AWK} '{print $3}'` + printf "$jobidreported" + + if [ "$jobidreported" = "$isbjobid" ]; then + test_done + else + test_failed + print_error "Not returned or no match" + fi + + + # Check states + + isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbjobid... $isbjobstate" + + if [ "${isbjobstate}" = "Submitted" ]; then + test_done + else + test_failed + print_error "'Submitted' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbsubjobid0... $isbjobstate" + + if [ "${isbjobstate}" = "Submitted" ]; then + test_done + else + test_failed + print_error "'Submitted' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbsubjobid1 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbsubjobid1... $isbjobstate" + + if [ "${isbjobstate}" = "Submitted" ]; then + test_done + else + test_failed + print_error "'Submitted' was expected" + fi + + # log START for subjob 1 + printf "Subjob 1 transfer starting... " + isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid1 --sequence $osbseqcode --event FileTransfer --result START` + + if [ -z $isbseqcode ]; then + test_failed + print_error "LogEvent failed" + else + test_done + fi + + # Check states + sleep 10 + + isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbjobid... $isbjobstate" + + if [ "${isbjobstate}" = "Running" ]; then + test_done + else + test_failed + print_error "'Running' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbsubjobid1 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbsubjobid1... $isbjobstate" + + if [ "${isbjobstate}" = "Running" ]; then + test_done + else + test_failed + print_error "'Running' was expected" + fi + + # log OK for subjob 1 + printf "Subjob 1 transfer ending... " + isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid1 --sequence $osbseqcode --event FileTransfer --result OK` + + if [ -z $isbseqcode ]; then + test_failed + print_error "LogEvent failed" + else + test_done + fi + + # Check states + sleep 10 + + isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbjobid... $isbjobstate" + + if [ "${isbjobstate}" = "Waiting" ]; then + test_done + else + test_failed + print_error "'Waiting' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbsubjobid1 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbsubjobid1... $isbjobstate" + + if [ "${isbjobstate}" = "Done" ]; then + test_done + else + test_failed + print_error "'Done' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbsubjobid1 | $SYS_GREP "done_code :" | ${SYS_AWK} '{print $3}'` + printf "Checking Done Code... $isbjobstate" + + if [ "${isbjobstate}" = "DONE_CODE_OK" ]; then + test_done + else + test_failed + print_error "'DONE_CODE_OK' was expected" + fi + + # log START for subjob 0 + printf "Subjob 0 transfer starting... " + isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid0 --sequence $osbseqcode --event FileTransfer --result START` + + if [ -z $isbseqcode ]; then + test_failed + print_error "LogEvent failed" + else + test_done + fi + + # Check states + sleep 10 + + isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbjobid... $isbjobstate" + + if [ "${isbjobstate}" = "Running" ]; then + test_done + else + test_failed + print_error "'Running' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbsubjobid0... $isbjobstate" + + if [ "${isbjobstate}" = "Running" ]; then + test_done + else + test_failed + print_error "'Running' was expected" + fi + + # log FAIL for subjob 0 + printf "Subjob 0 transfer ending... " + isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid0 --sequence $osbseqcode --event FileTransfer --result FAIL` + + if [ -z $isbseqcode ]; then + test_failed + print_error "LogEvent failed" + else + test_done + fi + + # Check states + sleep 10 + + isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbjobid... $isbjobstate" + if [ "${isbjobstate}" = "Waiting" ]; then + test_done + else + test_failed + print_error "'Waiting' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbsubjobid0... $isbjobstate" + + if [ "${isbjobstate}" = "Done" ]; then + test_done + else + test_failed + print_error "'Done' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "done_code :" | ${SYS_AWK} '{print $3}'` + printf "Checking Done Code... $isbjobstate" + + if [ "${isbjobstate}" = "DONE_CODE_FAILED" ]; then + test_done + else + test_failed + print_error "'DONE_CODE_FAILED' was expected" + fi + + # START and OK subjob 0 + + printf "Subjob 0 starting and ending..." + isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid0 --sequence $osbseqcode --event FileTransfer --result START` + isbseqcode=`$LBLOGEVENT --source LRMS --jobid $isbsubjobid0 --sequence $osbseqcode --event FileTransfer --result OK` + + # Check states + sleep 10 + + isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbjobid... $isbjobstate" + + if [ "${isbjobstate}" = "Done" ]; then + test_done + else + test_failed + print_error "'Done' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbjobid | $SYS_GREP -m 1 "done_code :" | ${SYS_AWK} '{print $3}'` + printf "Checking Done Code... $isbjobstate" + + if [ "${isbjobstate}" = "DONE_CODE_OK" ]; then + test_done + else + test_failed + print_error "'DONE_CODE_OK' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'` + printf "Checking state of $isbsubjobid... $isbjobstate" + + if [ "${isbjobstate}" = "Done" ]; then + test_done + else + test_failed + print_error "'Done' was expected" + fi + + isbjobstate=`$LBJOBSTATUS $isbsubjobid0 | $SYS_GREP "done_code :" | ${SYS_AWK} '{print $3}'` + printf "Checking Done Code... $isbjobstate" + + if [ "${isbjobstate}" = "DONE_CODE_OK" ]; then + test_done + else + test_failed + print_error "'DONE_CODE_OK' was expected" + fi + + + fi + fi + $SYS_RM sbtestjob.$$.err fi fi fi test_end -} &> $logfile +} +#} &> $logfile -if [ $flag -ne 1 ]; then - cat $logfile - $SYS_RM $logfile -fi +#if [ $flag -ne 1 ]; then +# cat $logfile +# $SYS_RM $logfile +#fi exit $TEST_OK -- 1.8.2.3