Overview
Comment: | Fixed couple issues with itemwait release test |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.60 |
Files: | files | file ages | folders |
SHA1: |
7d39363388bc3beb1651596dc46da961 |
User & Date: | matt on 2015-06-14 19:21:30 |
Other Links: | branch diff | manifest | tags |
Context
2015-06-14
| ||
23:08 | Added option to access data via server in dashboard check-in: 338767c19a user: matt tags: v1.60 | |
19:21 | Fixed couple issues with itemwait release test check-in: 7d39363388 user: matt tags: v1.60 | |
18:34 | Added test itemwait (uses itemmatch and itemwait) check-in: db023d6701 user: matt tags: v1.60 | |
Changes
Modified tests/release/tests/itemwait/testconfig from [0076141cfa] to [c976040a3b].
1 2 3 4 5 | # test2 from the tests/Makefile [var] tname itemwait | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | # test2 from the tests/Makefile [var] tname itemwait [pre-launch-env-vars] NUMTESTS 20 [ezsteps] # Set things up clean $MTRUNNER $MTTESTDIR/fdktestqa/testqa $MTPATH megatest -remove-runs -testpatt % -target %/% -runname #{get var tname}% runbigrun3 $MTRUNNER $MTTESTDIR/fdktestqa/testqa $MTPATH nbfake megatest -run -testpatt bigrun3 -target a/bigrun3 -runname #{get var tname} # watchrun watches until it sees at least one RUNNING in bigrun and one PASS in bigrun2 watchrun sleep 15;watchrun.sh #{get var tname} [requirements] # waiton #{getenv ALL_TOPLEVEL_TESTS} # This is a "toplevel" test, it does not require waitons to be non-FAIL to run # mode toplevel |
︙ | ︙ |
Modified tests/release/tests/itemwait/watchrun.sh from [164034822d] to [3cd7d57805].
1 2 3 4 | #!/bin/bash runname=$1 | | | | > | | > | | | > > > > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #!/bin/bash runname=$1 pass=no alldone=no while [[ $alldone == no ]];do sleep 5 $MTRUNNER $MTTESTDIR/fdktestqa/testqa $MTPATH megatest -list-runs $runname > list-runs.log bigrun_running=$(cat list-runs.log | egrep 'bigrun\(.*RUNNING'|wc -l) bigrun2_pass=$(cat list-runs.log | egrep 'bigrun2.*COMPLETED.*PASS'|wc -l) echo "bigrun_running=$bigrun_running, bigrun2_pass=$bigrun2_pass" if [[ $bigrun_running -gt 0 ]] && [[ $bigrun2_pass -gt 0 ]];then pass=yes alldone=yes fi if [[ $bigrun_running -eq 0 ]];then echo "bigrun all done and no bigrun2 found with PASS." alldone=yes fi done if [[ $pass == yes ]];then echo PASS exit 0 else echo FAIL exit 1 fi |