Overview
Comment: | Added blanking out the comment on reseting a test |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5411a1be298579a2392674c68171bafc |
User & Date: | mrwellan on 2011-05-11 13:32:16 |
Other Links: | manifest | tags |
Context
2011-05-14
| ||
18:09 | Merging subtest-rollup to trunk check-in: 00761e1112 user: matt tags: trunk, v1.06 | |
2011-05-12
| ||
00:03 | Implemented parent tests for multipart tests, PASS and FAIL counts and net status are rolled up for tests check-in: 77871638c9 user: matt tags: subtest-rollup | |
2011-05-11
| ||
13:32 | Added blanking out the comment on reseting a test check-in: 5411a1be29 user: mrwellan tags: trunk | |
07:59 | Added proper cleanup after removing a run. test dirs and run dir are removed if empty check-in: 79c34d7700 user: matt tags: trunk | |
Changes
Modified db.scm from [5decf9595d] to [3bc7d64bed].
︙ | ︙ | |||
228 229 230 231 232 233 234 235 236 237 238 239 240 241 | (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment) (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment))) db "SELECT id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment FROM tests WHERE run_id=? AND testname=? AND item_path=?;" run-id testname item-path) res)) ;; Steps ;; Run steps ;; make-vector-record "Run steps" db step id test_id stepname step_complete step_pass event_time (define (make-db:step)(make-vector 6)) (define-inline (db:step-get-id vec) (vector-ref vec 0)) (define-inline (db:step-get-test_id vec) (vector-ref vec 1)) (define-inline (db:step-get-stepname vec) (vector-ref vec 2)) | > > > > > > > | 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment) (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment))) db "SELECT id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment FROM tests WHERE run_id=? AND testname=? AND item_path=?;" run-id testname item-path) res)) ;; (define (db:test-set-comment db run-id testname item-path comment) (sqlite3:execute db "UPDATE tests SET comment=? WHERE run_id=? AND testname=? AND item_path=?;" comment run-id testname item-path)) ;; Steps ;; Run steps ;; make-vector-record "Run steps" db step id test_id stepname step_complete step_pass event_time (define (make-db:step)(make-vector 6)) (define-inline (db:step-get-id vec) (vector-ref vec 0)) (define-inline (db:step-get-test_id vec) (vector-ref vec 1)) (define-inline (db:step-get-stepname vec) (vector-ref vec 2)) |
︙ | ︙ |
Modified megatest.scm from [2b3fb13636] to [1850c2555e].
︙ | ︙ | |||
105 106 107 108 109 110 111 112 113 114 115 116 117 118 | (include "configf.scm") (include "process.scm") (include "launch.scm") (include "runs.scm") ;; (include "gui.scm") (define *didsomething* #f) ;;====================================================================== ;; Query runs ;;====================================================================== (if (args:get-arg "-list-runs") (let* ((db (begin | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | (include "configf.scm") (include "process.scm") (include "launch.scm") (include "runs.scm") ;; (include "gui.scm") (define *didsomething* #f) ;;====================================================================== ;; Remove old run(s) ;;====================================================================== (define (remove-runs) (cond ((not (args:get-arg ":runname")) (print "ERROR: Missing required parameter for -remove-runs, you must specify the run name pattern with :runname patt") (exit 2)) ((not (args:get-arg "-testpatt")) (print "ERROR: Missing required parameter for -remove-runs, you must specify the test pattern with -testpatt") (exit 3)) ((not (args:get-arg "-itempatt")) (print "ERROR: Missing required parameter for -remove-runs, you must specify the items with -itempatt") (exit 4)) ((let ((db #f)) (if (not (setup-for-run)) (begin (print "Failed to setup, exiting") (exit 1))) (set! db (open-db)) (if (not (car *configinfo*)) (begin (print "ERROR: Attempted to remove test(s) but run area config file not found") (exit 1)) ;; put test parameters into convenient variables (runs:remove-runs db (args:get-arg ":runname") (args:get-arg "-testpatt") (args:get-arg "-itempatt"))) (sqlite3:finalize! db) (set! *didsomething* #t))))) (if (args:get-arg "-remove-runs") (remove-runs)) ;;====================================================================== ;; Query runs ;;====================================================================== (if (args:get-arg "-list-runs") (let* ((db (begin |
︙ | ︙ | |||
260 261 262 263 264 265 266 | (sqlite3:finalize! db) (run-waiting-tests #f) (set! *didsomething* #t)))) (if (args:get-arg "-runtests") (runtests)) | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 296 297 298 299 300 301 302 303 304 305 306 307 308 309 | (sqlite3:finalize! db) (run-waiting-tests #f) (set! *didsomething* #t)))) (if (args:get-arg "-runtests") (runtests)) ;;====================================================================== ;; execute the test ;; - gets called on remote host ;; - receives info from the -execute param ;; - passes info to steps via MT_CMDINFO env var (future is to use a dot file) ;; - gathers host info and ;;====================================================================== |
︙ | ︙ |
Modified runs.scm from [32dfecc25c] to [243bc1392b].
︙ | ︙ | |||
46 47 48 49 50 51 52 | ;; runs:get-runs-by-patt ;; get runs by list of criteria ;; register a test run with the db ;; ;; Use: (db-get-value-by-header (db:get-header runinfo)(db:get-row runinfo)) ;; to extract info from the structure returned ;; | | | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | ;; runs:get-runs-by-patt ;; get runs by list of criteria ;; register a test run with the db ;; ;; Use: (db-get-value-by-header (db:get-header runinfo)(db:get-row runinfo)) ;; to extract info from the structure returned ;; (define (runs:get-runs-by-patt db keys runnamepatt . params) ;; test-name) (let* ((keyvallst (keys->vallist keys)) (tmp (runs:get-std-run-fields keys '("id" "runname" "state" "status" "owner" "event_time"))) (keystr (car tmp)) (header (cadr tmp)) (res '()) (key-patt "")) (for-each (lambda (keyval) |
︙ | ︙ | |||
273 274 275 276 277 278 279 280 281 282 283 284 285 286 | (begin (let loop2 ((ts #f) (ct 0)) (if (and (not ts) (< ct 10)) (begin (register-test db run-id test-name item-path) (db:delete-test-step-records db run-id test-name) ;; clean out if this is a re-run (loop2 (db:get-test-info db run-id test-name item-path) (+ ct 1))) (if ts (set! test-status ts) (begin (print "WARNING: Couldn't register test " test-name " with item path " item-path ", skipping") | > > > | 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 | (begin (let loop2 ((ts #f) (ct 0)) (if (and (not ts) (< ct 10)) (begin (register-test db run-id test-name item-path) (db:test-set-comment db run-id test-name item-path "") ;; (test-set-status! db run-id test-name "NOT_STARTED" "n/a" itemdat "") ;; (db:set-comment-for-test db run-id test-name item-path "") (db:delete-test-step-records db run-id test-name) ;; clean out if this is a re-run (loop2 (db:get-test-info db run-id test-name item-path) (+ ct 1))) (if ts (set! test-status ts) (begin (print "WARNING: Couldn't register test " test-name " with item path " item-path ", skipping") |
︙ | ︙ | |||
374 375 376 377 378 379 380 | (print "Header: " header) (for-each (lambda (run) (let ((runkey (string-intersperse (map (lambda (k) (db-get-value-by-header run header (vector-ref k 0))) keys) "/"))) (let* ((run-id (db-get-value-by-header run header "id") ) (tests (db-get-tests-for-run db (db-get-value-by-header run header "id") testpatt itempatt)) | | | 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 | (print "Header: " header) (for-each (lambda (run) (let ((runkey (string-intersperse (map (lambda (k) (db-get-value-by-header run header (vector-ref k 0))) keys) "/"))) (let* ((run-id (db-get-value-by-header run header "id") ) (tests (db-get-tests-for-run db (db-get-value-by-header run header "id") testpatt itempatt)) (lasttpath "/does/not/exist/I/hope")) (if (not (null? tests)) (begin (print "Removing tests for run: " runkey " " (db-get-value-by-header run header "runname")) (for-each (lambda (test) (print " " (db:test-get-testname test) " id: " (db:test-get-id test) " " (db:test-get-item-path test)) (db:delete-test-records db (db:test-get-id test)) |
︙ | ︙ |