Overview
Comment: | Fixed status during eztest runs, merely set to RUNNING |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
64932fb9cdcc30acec520ce500db6d0c |
User & Date: | matt on 2012-01-24 22:13:44 |
Other Links: | manifest | tags |
Context
2012-01-26
| ||
09:32 | Merged in minor fix from fixing-logpro-test_data branch check-in: 8e7dd486e5 user: mrwellan tags: trunk | |
09:23 | Merged trunk to fixing-logpro-test_data Closed-Leaf check-in: 439b0bbdef user: mrwellan tags: fixing-logpro-test_data | |
2012-01-24
| ||
22:13 | Fixed status during eztest runs, merely set to RUNNING check-in: 64932fb9cd user: matt tags: trunk | |
2012-01-22
| ||
22:03 | Added -target support for remove-runs check-in: fe1582c208 user: matt tags: trunk | |
Changes
Modified dashboard-tests.scm from [2959a1c9ce] to [8aad97ccf0].
︙ | ︙ | |||
264 265 266 267 268 269 270 | (testmeta (if testdat (let ((tm (db:testmeta-get-record db testname))) (if tm tm (make-db:testmeta))) (make-db:testmeta))) (keystring (string-intersperse (map (lambda (keyval) | | > | | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | (testmeta (if testdat (let ((tm (db:testmeta-get-record db testname))) (if tm tm (make-db:testmeta))) (make-db:testmeta))) (keystring (string-intersperse (map (lambda (keyval) ;; (conc ":" (car keyval) " " (cadr keyval))) (cadr keyval)) keydat) "/")) (item-path (db:test-get-item-path testdat)) (viewlog (lambda (x) (if (file-exists? logfile) ;(system (conc "firefox " logfile "&")) (iup:send-url logfile) (message-window (conc "File " logfile " not found"))))) (xterm (lambda (x) |
︙ | ︙ | |||
330 331 332 333 334 335 336 | (command-text-box (iup:textbox #:expand "HORIZONTAL" #:font "Courier New, -10")) (command-launch-button (iup:button "Execute!" #:action (lambda (x) (let ((cmd (iup:attribute command-text-box "VALUE"))) (system (conc cmd " &")))))) (run-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" | | | | | | 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 | (command-text-box (iup:textbox #:expand "HORIZONTAL" #:font "Courier New, -10")) (command-launch-button (iup:button "Execute!" #:action (lambda (x) (let ((cmd (iup:attribute command-text-box "VALUE"))) (system (conc cmd " &")))))) (run-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" (conc "megatest -runtests " testname " -target " keystring " :runname " runname " -itempatt " (if (equal? item-path "") "%" item-path) "" )))) (remove-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" (conc "megatest -remove-runs -target " keystring " :runname " runname " -testpatt " testname " -itempatt " (if (equal? item-path "") "%" item-path) " -v "))))) (cond ((not testdat)(begin (print "ERROR: bad test info for " test-id)(exit 1))) ((not rundat)(begin (print "ERROR: found test info but there is a problem with the run info for " run-id)(exit 1))) (else ;; (test-set-status! db run-id test-name state status itemdat) (set! self ; (iup:dialog #:close_cb (lambda (a)(exit)) ; #:expand "YES" |
︙ | ︙ |
Modified launch.scm from [de874bb868] to [3bbbbb3a8d].
︙ | ︙ | |||
215 216 217 218 219 220 221 | (else 'fail)))) (debug:print 4 "Exit value received: " (vector-ref exit-info 2) " logpro-used: " logpro-used " this-step-status: " this-step-status " overall-status: " overall-status " next-status: " next-status " rollup-status: " rollup-status) (case next-status ((warn) (set! rollup-status 2) | | > | > | > > | 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 | (else 'fail)))) (debug:print 4 "Exit value received: " (vector-ref exit-info 2) " logpro-used: " logpro-used " this-step-status: " this-step-status " overall-status: " overall-status " next-status: " next-status " rollup-status: " rollup-status) (case next-status ((warn) (set! rollup-status 2) ;; (test-set-status! db run-id test-name "COMPLETED" "WARN" itemdat (test-set-status! db run-id test-name "RUNNING" "WARN" itemdat (if (eq? this-step-status 'warn) "Logpro warning found" #f) #f)) ((pass) ;; (test-set-status! db run-id test-name "COMPLETED" "PASS" itemdat #f #f)) (test-set-status! db run-id test-name "RUNNING" "PASS" itemdat #f #f)) (else ;; 'fail (set! rollup-status 1) ;; force fail ;; (test-set-status! db run-id test-name "COMPLETED" "FAIL" itemdat (conc "Failed at step " stepname) #f) (test-set-status! db run-id test-name "RUNNING" "FAIL" itemdat (conc "Failed at step " stepname) #f) )))) (if (and (steprun-good? logpro-used (vector-ref exit-info 2)) (not (null? tal))) (loop (car tal) (cdr tal) stepname))) (debug:print 4 "WARNING: a prior step failed, stopping at " ezstep)))))))) (monitorjob (lambda () (let* ((start-seconds (current-seconds)) (calc-minutes (lambda () |
︙ | ︙ |
Modified tests/tests/ez_fail/testconfig from [0f917c7dd3] to [d90c6719c8].
1 2 3 4 5 6 | [setup] [requirements] priority 10 [ezsteps] | | | > | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | [setup] [requirements] priority 10 [ezsteps] lookittmp sleep 5s;ls /tmp lookithome sleep 2;ls /home # should fail on next step lookitnada sleep 3;ls /nada lookitusr sleep 2;ls /usr [test_meta] author matt owner bob description This test runs a single ezstep which is expected to pass, no logpro file. tags first,single |
︙ | ︙ |