Overview
Comment: | Test of WARN support |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
6f9cfc22a73b01776123b1b9e9af937c |
User & Date: | mrwellan on 2011-06-05 22:59:38 |
Other Links: | manifest | tags |
Context
2011-06-06
| ||
21:49 | Bumped version to 1.11 check-in: f31622c001 user: mrwellan tags: trunk | |
2011-06-05
| ||
22:59 | Test of WARN support check-in: 6f9cfc22a7 user: mrwellan tags: trunk | |
2011-05-31
| ||
12:20 | Added mtutils.csh check-in: f412143bd2 user: mrwellan tags: trunk | |
Changes
Modified dashboard.scm from [8443e49efc] to [a0d7819548].
︙ | ︙ | |||
142 143 144 145 146 147 148 | (iup:label "STATUS:" #:size "30x") (let ((lb (iup:listbox #:action (lambda (val a b c) (set! newstatus a)) #:editbox "YES" #:value currstatus #:expand "YES"))) (iuplistbox-fill-list lb | | | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | (iup:label "STATUS:" #:size "30x") (let ((lb (iup:listbox #:action (lambda (val a b c) (set! newstatus a)) #:editbox "YES" #:value currstatus #:expand "YES"))) (iuplistbox-fill-list lb (list "PASS" "WARN" "FAIL" "CHECK" "n/a") currstatus) lb))) (iup:hbox (iup:label "Comment:") (iup:textbox #:action (lambda (val a b) (set! currcomment b)) #:value currcomment #:expand "YES")) |
︙ | ︙ | |||
266 267 268 269 270 271 272 | (teststate (db:test-get-state test)) (teststart (db:test-get-event_time test)) (runtime (db:test-get-run_duration test)) (buttontxt (if (equal? teststate "COMPLETED") teststatus teststate)) (button (vector-ref columndat rown)) (color (case (string->symbol teststate) ((COMPLETED) | | > > > > | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 | (teststate (db:test-get-state test)) (teststart (db:test-get-event_time test)) (runtime (db:test-get-run_duration test)) (buttontxt (if (equal? teststate "COMPLETED") teststatus teststate)) (button (vector-ref columndat rown)) (color (case (string->symbol teststate) ((COMPLETED) (if (equal? teststatus "PASS") "70 249 73" (if (equal? teststatus "WARN") "255 172 13" "223 33 49"))) ;; greenish orangeish redish ((LAUNCHED) "101 123 142") ((CHECK) "255 100 50") ((REMOTEHOSTSTART) "50 130 195") ((RUNNING) "9 131 232") ((KILLREQ) "39 82 206") ((KILLED) "234 101 17") (else "192 192 192"))) |
︙ | ︙ |
Modified db.scm from [b69aff6aa1] to [e509962d69].
︙ | ︙ | |||
310 311 312 313 314 315 316 | (for-each (lambda (waitontest-name) (let ((ever-seen #f)) (for-each (lambda (test) (if (equal? waitontest-name (db:test-get-testname test)) (begin (set! ever-seen #t) (if (not (and (equal? (db:test-get-state test) "COMPLETED") | > | | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 | (for-each (lambda (waitontest-name) (let ((ever-seen #f)) (for-each (lambda (test) (if (equal? waitontest-name (db:test-get-testname test)) (begin (set! ever-seen #t) (if (not (and (equal? (db:test-get-state test) "COMPLETED") (or (equal? (db:test-get-status test) "PASS") (equal? (db:test-get-status test) "WARN")))) (set! result (cons waitontest-name result)))))) tests) (if (not ever-seen)(set! result (cons waitontest-name result))))) waiton) (delete-duplicates result)))) ;; ;; ;; subtract from the waiton list the "COMPLETED" tests |
︙ | ︙ |
Modified megatest.scm from [6cde811fe4] to [5d9c3a7d60].
1 2 3 4 5 6 7 8 9 10 | ;; Copyright 2006-2011, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. (include "common.scm") | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | ;; Copyright 2006-2011, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. (include "common.scm") (define megatest-version 1.10) (define help (conc " Megatest, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " license GPL, Copyright Matt Welland 2006-2011 Usage: megatest [options] |
︙ | ︙ | |||
186 187 188 189 190 191 192 | (conc "(" (db:test-get-item-path test) ")"))) (db:test-get-state test) (db:test-get-status test) (db:test-get-run_duration test) (db:test-get-event_time test) (db:test-get-host test)) (if (not (or (equal? (db:test-get-status test) "PASS") | > | | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | (conc "(" (db:test-get-item-path test) ")"))) (db:test-get-state test) (db:test-get-status test) (db:test-get-run_duration test) (db:test-get-event_time test) (db:test-get-host test)) (if (not (or (equal? (db:test-get-status test) "PASS") (equal? (db:test-get-status test) "WARN") (equal? (db:test-get-state test) "NOT_STARTED"))) (begin (print " cpuload: " (db:test-get-cpuload test) "\n diskfree: " (db:test-get-diskfree test) "\n uname: " (db:test-get-uname test) "\n rundir: " (db:test-get-rundir test) ) ;; Each test |
︙ | ︙ |
Modified runs.scm from [a0a9838068] to [ac80fea080].
︙ | ︙ | |||
89 90 91 92 93 94 95 96 97 98 99 100 101 | (define (test-set-status! db run-id test-name state status itemdat-or-path . comment) (let ((item-path (if (string? itemdat-or-path) itemdat-or-path (item-list->path itemdat-or-path)))) (sqlite3:execute db "UPDATE tests SET state=?,status=?,event_time=strftime('%s','now') WHERE run_id=? AND testname=? AND item_path=?;" state status run-id test-name item-path) (if (and (not (equal? item-path "")) ;; need to update the top test record if PASS or FAIL and this is a subtest (or (equal? status "PASS") (equal? status "FAIL"))) (begin (sqlite3:execute db "UPDATE tests SET fail_count=(SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND status='FAIL'), | > | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | (define (test-set-status! db run-id test-name state status itemdat-or-path . comment) (let ((item-path (if (string? itemdat-or-path) itemdat-or-path (item-list->path itemdat-or-path)))) (sqlite3:execute db "UPDATE tests SET state=?,status=?,event_time=strftime('%s','now') WHERE run_id=? AND testname=? AND item_path=?;" state status run-id test-name item-path) (if (and (not (equal? item-path "")) ;; need to update the top test record if PASS or FAIL and this is a subtest (or (equal? status "PASS") (equal? status "WARN") (equal? status "FAIL"))) (begin (sqlite3:execute db "UPDATE tests SET fail_count=(SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND status='FAIL'), pass_count=(SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND (status='PASS' OR status='WARN')) WHERE run_id=? AND testname=? AND item_path='';" run-id test-name run-id test-name run-id test-name) (sqlite3:execute db "UPDATE tests SET state='COMPLETED', status=CASE WHEN fail_count > 0 THEN 'FAIL' WHEN pass_count > 0 AND fail_count=0 THEN 'PASS' ELSE 'UNKNOWN' END |
︙ | ︙ | |||
338 339 340 341 342 343 344 345 346 347 348 349 350 351 | (string->symbol (test:get-state test-status)) 'failed-to-insert)) ((failed-to-insert) (print "ERROR: Failed to insert the record into the db")) ((NOT_STARTED COMPLETED) ;; (cadr status is the row id for the run record) (if (and (equal? (test:get-state test-status) "COMPLETED") (or (equal? (test:get-status test-status) "PASS") (equal? (test:get-status test-status) "CHECK")) (not (args:get-arg "-force"))) (print "NOTE: Not starting test " new-test-name " as it is state \"COMPLETED\" and status \"" (test:get-status test-status) "\", use -force to override") (let* ((get-prereqs-cmd (lambda () (db-get-prereqs-not-met db run-id waiton))) ;; check before running .... (launch-cmd (lambda () (launch-test db run-id test-conf keyvallst test-name test-path itemdat))) | > | 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | (string->symbol (test:get-state test-status)) 'failed-to-insert)) ((failed-to-insert) (print "ERROR: Failed to insert the record into the db")) ((NOT_STARTED COMPLETED) ;; (cadr status is the row id for the run record) (if (and (equal? (test:get-state test-status) "COMPLETED") (or (equal? (test:get-status test-status) "PASS") (equal? (test:get-status test-status) "WARN") (equal? (test:get-status test-status) "CHECK")) (not (args:get-arg "-force"))) (print "NOTE: Not starting test " new-test-name " as it is state \"COMPLETED\" and status \"" (test:get-status test-status) "\", use -force to override") (let* ((get-prereqs-cmd (lambda () (db-get-prereqs-not-met db run-id waiton))) ;; check before running .... (launch-cmd (lambda () (launch-test db run-id test-conf keyvallst test-name test-path itemdat))) |
︙ | ︙ |
Modified tests/tests/runfirst/wasting_time.logpro from [26a59d97ac] to [73cad9c3a4].
1 | ;; put stuff here | > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | ;; put stuff here ;; NOTE: This is not legit logpro code!!! ;; Test for 0=PASS, 1=WARN, >2 = FAIL (define season (get-environment-variable "SEASON")) (exit (case (string->symbol season) ((summer) 0) ((winter) 1) ((fall) 2) (else 0))) |