Overview
| Comment: | Cleaned up test1. Removed caching from get test path |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | monitor-cleanup |
| Files: | files | file ages | folders |
| SHA1: |
b477cee409a023b01fe32d04de2e40ac |
| User & Date: | matt on 2012-10-30 03:01:05 |
| Other Links: | branch diff | manifest | tags |
Context
|
2012-10-30
| ||
| 04:57 | Fixed items not running, need only to fix the rollup to parent test check-in: 6fe342fac1 user: matt tags: monitor-cleanup | |
| 03:01 | Cleaned up test1. Removed caching from get test path check-in: b477cee409 user: matt tags: monitor-cleanup | |
| 01:55 | runs.scm converted to all zmq calls check-in: a4446c2457 user: matt tags: monitor-cleanup | |
Changes
Modified db.scm from [9ab89f3ef4] to [86dd8c96cc].
| ︙ | ︙ | |||
251 252 253 254 255 256 257 258 259 260 261 262 263 264 |
(begin
(debug:print-info 11 "open-test-db END (unsucessful)" testpath)
#f)))
;; find and open the testdat.db file for an existing test
(define (db:open-test-db-by-test-id db test-id)
(let* ((test-path (db:test-get-rundir-from-test-id db test-id)))
(open-test-db test-path)))
(define (db:testdb-initialize db)
(debug:print 11 "db:testdb-initialize START")
(for-each
(lambda (sqlcmd)
(sqlite3:execute db sqlcmd))
| > | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 |
(begin
(debug:print-info 11 "open-test-db END (unsucessful)" testpath)
#f)))
;; find and open the testdat.db file for an existing test
(define (db:open-test-db-by-test-id db test-id)
(let* ((test-path (db:test-get-rundir-from-test-id db test-id)))
(debug:print 3 "TEST PATH: " test-path)
(open-test-db test-path)))
(define (db:testdb-initialize db)
(debug:print 11 "db:testdb-initialize START")
(for-each
(lambda (sqlcmd)
(sqlite3:execute db sqlcmd))
|
| ︙ | ︙ | |||
956 957 958 959 960 961 962 | (define (cdb:test-set-rundir! zmqsocket run-id test-name item-path rundir) (cdb:client-call zmqsocket 'test-set-rundir #t rundir run-id test-name item-path)) (define (cdb:test-set-rundir-by-test-id zmqsocket test-id rundir) (cdb:client-call zmqsocket 'test-set-rundir-by-test-id #t test-id rundir)) (define (db:test-get-rundir-from-test-id db test-id) | | | | | | | | | | | | | | 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 |
(define (cdb:test-set-rundir! zmqsocket run-id test-name item-path rundir)
(cdb:client-call zmqsocket 'test-set-rundir #t rundir run-id test-name item-path))
(define (cdb:test-set-rundir-by-test-id zmqsocket test-id rundir)
(cdb:client-call zmqsocket 'test-set-rundir-by-test-id #t test-id rundir))
(define (db:test-get-rundir-from-test-id db test-id)
(let ((res #f)) ;; (hash-table-ref/default *test-paths* test-id #f)))
;; (if res
;; res
;; (begin
(sqlite3:for-each-row
(lambda (tpath)
(set! res tpath))
db
"SELECT rundir FROM tests WHERE id=?;"
test-id)
;; (hash-table-set! *test-paths* test-id res)
res)) ;; ))
(define (cdb:test-set-log! zmqsocket test-id logf)
(if (string? logf)(cdb:client-call zmqsocket 'test-set-log #f test-id logf)))
;;======================================================================
;; Misc. test related queries
;;======================================================================
|
| ︙ | ︙ |
Modified tests/tests.scm from [ca5d2d637d] to [68603783d6].
| ︙ | ︙ | |||
275 276 277 278 279 280 281 |
(change-directory test-work-dir)
(test "Add a step" #t
(begin
(db:teststep-set-status! db 2 "step1" "start" 0 "This is a comment" "mylogfile.html")
(sleep 2)
(db:teststep-set-status! db 2 "step1" "end" "pass" "This is a different comment" "finallogfile.html")
| | | | > > | > | | | > > > | 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 |
(change-directory test-work-dir)
(test "Add a step" #t
(begin
(db:teststep-set-status! db 2 "step1" "start" 0 "This is a comment" "mylogfile.html")
(sleep 2)
(db:teststep-set-status! db 2 "step1" "end" "pass" "This is a different comment" "finallogfile.html")
(set! test-id (db:test-get-id (car (cdb:remote-run db:get-tests-for-run #f 1 "test1" '() '()))))
(number? test-id)))
(test "Get rundir" #t (let ((rundir (cdb:remote-run db:test-get-rundir-from-test-id #f test-id)))
(print "Rundir " rundir)
(system (conc "mkdir -p " rundir))
(string? rundir)))
(test #f #t (sqlite3#database? (open-test-db "./")))
(test "Create a test db" "../simpleruns/key1/key2/myrun/test1/testdat.db"
(let ((tdb (open-run-close db:open-test-db-by-test-id db test-id)))
(if tdb (sqlite3#finalize! tdb))
(file-exists? "../simpleruns/key1/key2/myrun/test1/testdat.db")))
(test "Get steps for test" #t (let ((steps (cdb:remote-run db:get-steps-for-test #f test-id)))
(print steps)
(> (length steps) 0)))
(test "Get nice table for steps" "2.0s"
(begin
(vector-ref (hash-table-ref (open-run-close db:get-steps-table #f test-id) "step1") 4)))
;; (exit)
;;======================================================================
|
| ︙ | ︙ |