Overview
| Comment: | Added unit test to exercise server cycle |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
4efa55d2d5f957ccc0a360d4f9c65aa0 |
| User & Date: | matt on 2014-12-14 21:29:17 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-12-14
| ||
| 21:47 | Added unit test to exercise server cycle check-in: 004afb0916 user: matt tags: v1.60 | |
| 21:29 | Added unit test to exercise server cycle check-in: 4efa55d2d5 user: matt tags: v1.60 | |
|
2014-12-11
| ||
| 21:33 | Merged unit-test-fix (aka watchdog delay bug) check-in: f05c3af232 user: matt tags: v1.60 | |
Changes
Modified rmt.scm from [537ba5245e] to [40211cab4f].
| ︙ | ︙ | |||
18 19 20 21 22 23 24 | (declare (uses nmsg-transport)) ;; ;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!! ;; ;; ;; For debugging add the following to ~/.megatestrc | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | (declare (uses nmsg-transport)) ;; ;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!! ;; ;; ;; For debugging add the following to ~/.megatestrc ;;a ;; (require-library trace) ;; (import trace) ;; (trace ;; rmt:send-receive ;; api:execute-requests ;; ) |
| ︙ | ︙ | |||
254 255 256 257 258 259 260 |
;; (jparams (db:obj->string params)) ;; (rmt:dat->json-str params))
(res (handle-exceptions
exn
#f
(http-transport:client-api-send-receive run-id connection-info cmd params))))
;; ((commfail) (vector #f "communications fail")))))
(if (and res (vector-ref res 0))
| | | 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 |
;; (jparams (db:obj->string params)) ;; (rmt:dat->json-str params))
(res (handle-exceptions
exn
#f
(http-transport:client-api-send-receive run-id connection-info cmd params))))
;; ((commfail) (vector #f "communications fail")))))
(if (and res (vector-ref res 0))
(vector-ref res 1) ;;; YES!! THIS IS CORRECT!! CHANGE IT HERE, THEN CHANGE rmt:send-receive ALSO!!!
#f)))
;; (db:string->obj (vector-ref dat 1))
;; (begin
;; (debug:print 0 "ERROR: rmt:send-receive-no-auto-client-setup failed, attempting to continue. Got " dat)
;; dat))))
;; Wrap json library for strings (why the ports crap in the first place?)
|
| ︙ | ︙ |
Modified tasks.scm from [274e4ea2dc] to [1ea4ffe4d5].
| ︙ | ︙ | |||
398 399 400 401 402 403 404 |
(define (tasks:get-all-servers mdb)
(let ((res '()))
(sqlite3:for-each-row
(lambda (id pid hostname interface port pubport start-time priority state mt-version last-update transport run-id)
;; 0 1 2 3 4 5 6 7 8 9 10 11 12
(set! res (cons (vector id pid hostname interface port pubport start-time priority state mt-version last-update transport run-id) res)))
mdb
| | > > > > > > > > > > > > > | 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 |
(define (tasks:get-all-servers mdb)
(let ((res '()))
(sqlite3:for-each-row
(lambda (id pid hostname interface port pubport start-time priority state mt-version last-update transport run-id)
;; 0 1 2 3 4 5 6 7 8 9 10 11 12
(set! res (cons (vector id pid hostname interface port pubport start-time priority state mt-version last-update transport run-id) res)))
mdb
"SELECT id,pid,hostname,interface,port,pubport,start_time,priority,state,mt_version,strftime('%s','now')-heartbeat AS last_update,transport,run_id
FROM servers WHERE state NOT LIKE 'defunct%' ORDER BY start_time DESC;")
res))
(define (tasks:get-server-records mdb run-id)
(let ((res '()))
(sqlite3:for-each-row
(lambda (id pid hostname interface port pubport start-time priority state mt-version last-update transport run-id)
;; 0 1 2 3 4 5 6 7 8 9 10 11 12
(set! res (cons (vector id pid hostname interface port pubport start-time priority state mt-version last-update transport run-id) res)))
mdb
"SELECT id,pid,hostname,interface,port,pubport,start_time,priority,state,mt_version,strftime('%s','now')-heartbeat AS last_update,transport,run_id
FROM servers WHERE run_id=? AND state NOT LIKE 'defunct%' ORDER BY start_time DESC;"
run-id)
(reverse res)))
;; no elegance here ...
;;
(define (tasks:kill-server hostname pid)
(debug:print-info 0 "Attempting to kill server process " pid " on host " hostname)
(setenv "TARGETHOST" hostname)
(setenv "TARGETHOST_LOGF" "server-kills.log")
|
| ︙ | ︙ |
Modified tests/unittests/basicserver.scm from [674ba78eb7] to [bbe04303a3].
| ︙ | ︙ | |||
56 57 58 59 60 61 62 |
(list 0 1))
(define user (current-user-name))
(define runname "mytestrun")
(define keys (rmt:get-keys))
(define runinfo #f)
(define keyvals '(("SYSTEM" "abc")("RELEASE" "def")))
| | > | | > | | | < > > > > > > > > > < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 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 155 156 157 158 159 160 161 162 163 164 165 166 |
(list 0 1))
(define user (current-user-name))
(define runname "mytestrun")
(define keys (rmt:get-keys))
(define runinfo #f)
(define keyvals '(("SYSTEM" "abc")("RELEASE" "def")))
(define header (list "SYSTEM" "RELEASE" "id" "runname" "state" "status" "owner" "event_time"))
;; Setup
;;
(test #f #f (not (client:setup run-id)))
(test #f #f (not (hash-table-ref/default *runremote* run-id #f)))
;; Login
;;
(test #f'(#t "successful login")
(rmt:login-no-auto-client-setup (hash-table-ref/default *runremote* run-id #f) run-id))
(test #f '(#t "successful login")
(rmt:login run-id))
;; Keys
;;
(test #f '("SYSTEM" "RELEASE") (rmt:get-keys))
;; No data in db
;;
(test #f '() (rmt:get-all-run-ids))
(test #f #f (rmt:get-run-name-from-id run-id))
(test #f
(vector
header
(vector #f #f #f #f))
(rmt:get-run-info run-id))
;; Insert data into db
;;
(test #f 1 (rmt:register-run keyvals runname "new" "n/a" user))
;; (test #f #f (rmt:get-runs-by-patt keys runname))
(test #f #t (rmt:general-call 'register-test run-id run-id "test-one" ""))
(define test-one-id #f)
(test #f 1 (let ((test-id (rmt:get-test-id run-id "test-one" "")))
(set! test-one-id test-id)
test-id))
(define test-one-rec #f)
(test #f "test-one" (let ((test-rec (rmt:get-test-info-by-id run-id test-one-id)))
(set! test-one-rec test-rec)
(vector-ref test-rec 2)))
;; With data in db
;;
(print "Using runame=" runname)
(test #f '(1) (rmt:get-all-run-ids))
(test #f runname (rmt:get-run-name-from-id run-id))
(test #f
runname
(let ((run-info (rmt:get-run-info run-id)))
(db:get-value-by-header (db:get-rows run-info)
(db:get-header run-info)
"runname")))
(for-each (lambda (run-id)
;; test killing server
;;
(tasks:kill-server-run-id run-id)
(test #f #f (tasks:server-running-or-starting? (db:delay-if-busy (tasks:open-db)) run-id))
)
(list 0 1))
;; Tests to assess reading/writing while servers are starting/stopping
(define start-time (current-seconds))
(let loop ((test-state 'start))
(let* ((server-dats (tasks:get-server-records (db:delay-if-busy (tasks:open-db)) run-id))
(first-dat (if (not (null? server-dats))
(car server-dats)
#f)))
(map (lambda (dat)
(apply print (intersperse (vector->list dat) ", ")))
server-dats)
(test #f test-one-rec (rmt:get-test-info-by-id run-id test-one-id))
(thread-sleep! 1)
(case test-state
((start)
(print "Trying to start server")
(server:kind-run run-id)
(loop 'server-started))
((server-started)
(case (vector-ref first-dat)
((running)
(print "Server appears to be running. Now ask it to shutdown")
(rmt:kill-server run-id)
(loop 'server-shutdown))
((shutting-down)
(loop test-state))
(else (print "Don't know what to do if get here"))))
((server-shutdown)
(loop test-state)))))
;;======================================================================
;; END OF TESTS
;;======================================================================
;; (test #f #f (client:setup run-id))
;; (set! *transport-type* 'http)
;;
;; (test "setup for run" #t (begin (launch:setup-for-run)
;; (string? (getenv "MT_RUN_AREA_HOME"))))
;;
|
| ︙ | ︙ |
Modified tests/unittests/server.scm from [fc736c5f6c] to [9dc881f037].
1 2 3 4 5 6 7 8 | ;;====================================================================== ;; S E R V E R ;;====================================================================== ;; Run like this: ;; ;; (cd ..;make && make install) && ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0) | | > | | < | > > > | < > > > > | < < | > > > > | | < < < < | | < > > | > > > > > > > > > > > | < < | | < | > > | > | > | > > > > > | | < < | > > > > > | < < > | > | < | > > > > > | > | | > | < < < > > > | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 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 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 |
;;======================================================================
;; S E R V E R
;;======================================================================
;; Run like this:
;;
;; (cd ..;make && make install) && ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
(delete-file* "logs/1.log")
(define run-id 1)
(test "setup for run" #t (begin (launch:setup-for-run)
(string? (getenv "MT_RUN_AREA_HOME"))))
;; Insert data into db
;;
(define user (current-user-name))
(define runname "mytestrun")
(define keys (rmt:get-keys))
(define runinfo #f)
(define keyvals '(("SYSTEM" "abc")("RELEASE" "def")))
(define header (list "SYSTEM" "RELEASE" "id" "runname" "state" "status" "owner" "event_time"))
(test #f 1 (rmt:register-run keyvals runname "new" "n/a" user))
;; (test #f #f (rmt:get-runs-by-patt keys runname))
(test #f #t (rmt:general-call 'register-test run-id run-id "test-one" ""))
(define test-one-id #f)
(test #f 1 (let ((test-id (rmt:get-test-id run-id "test-one" "")))
(set! test-one-id test-id)
test-id))
(define test-one-rec #f)
(test #f "test-one" (let ((test-rec (rmt:get-test-info-by-id run-id test-one-id)))
(set! test-one-rec test-rec)
(vector-ref test-rec 2)))
;; Tests to assess reading/writing while servers are starting/stopping
(define start-time (current-seconds))
(let loop ((test-state 'start))
(let* ((server-dats (tasks:get-server-records (db:delay-if-busy (tasks:open-db)) run-id))
(first-dat (if (not (null? server-dats))
(car server-dats)
#f))
(server-state (or (and first-dat (string->symbol (vector-ref first-dat 8))) 'no-dat)))
(if first-dat
(map (lambda (dat)
(apply print (intersperse (vector->list dat) ", ")))
server-dats)
(print "No server"))
(test #f test-one-rec (rmt:get-test-info-by-id run-id test-one-id))
(thread-sleep! 1)
(case test-state
((start)
(print "Trying to start server")
(server:kind-run run-id)
(loop 'server-started))
((server-started)
(case server-state
((running)
(print "Server appears to be running. Now ask it to shutdown")
(rmt:kill-server run-id)
(loop 'shutdown-started))
((available)
(loop test-state))
((shutting-down)
(loop test-state))
((no-dat)
(loop test-state))
(else (print "Don't know what to do if get here"))))
((shutdown-started)
(case server-state
((no-dat)
(print "Server appears to have shutdown, ending this test"))
(else
(loop test-state)))))))
(exit)
;; (set! *transport-type* 'http)
;;
;; (test "setup for run" #t (begin (setup-for-run)
;; (string? (getenv "MT_RUN_AREA_HOME"))))
;;
;; (test "server-register, get-best-server" #t (let ((res #f))
;; (open-run-close tasks:server-register tasks:open-db 1 "bob" 1234 100 'live 'http)
;; (set! res (open-run-close tasks:get-best-server tasks:open-db))
;; (number? (vector-ref res 3))))
;;
;; (test "de-register server" #f (let ((res #f))
;; (open-run-close tasks:server-deregister tasks:open-db "bob" port: 1234)
;; (vector? (open-run-close tasks:get-best-server tasks:open-db))))
;;
;; (define server-pid #f)
;;
;; ;; Not sure how the following should work, replacing it with system of megatest -server
;; ;; (test "launch server" #t (let ((pid (process-fork (lambda ()
;; ;; ;; (daemon:ize)
;; ;; (server:launch 'http)))))
;; ;; (set! server-pid pid)
;; ;; (number? pid)))
;; (system "../../bin/megatest -server - -debug 22 > server.log 2> server.log &")
;;
;; (let loop ((n 10))
;; (thread-sleep! 1) ;; need to wait for server to start.
;; (let ((res (open-run-close tasks:get-best-server tasks:open-db)))
;; (print "tasks:get-best-server returned " res)
;; (if (and (not res)
;; (> n 0))
;; (loop (- n 1)))))
;;
;; (test "get-best-server" #t (begin
;; (client:launch)
;; (let ((dat (open-run-close tasks:get-best-server tasks:open-db)))
;; (vector? dat))))
;;
;; (define *keys* (keys:config-get-fields *configdat*))
;; (define *keyvals* (keys:target->keyval *keys* "a/b/c"))
;;
;; (test #f #t (string? (car *runremote*)))
;; (test #f '(#t "successful login") (rmt:login)) ;; *runremote* *toppath* *my-client-signature*)))
;;
;; (test #f #f (rmt:get-test-info-by-id 1 99)) ;; get non-existant test
;;
;; ;; RUNS
;; (test #f 1 (rmt:register-run *keyvals* "firstrun" "new" "n/a" (current-user-name)))
;; (test "get run info" "firstrun" (let ((rinfo (rmt:get-run-info 1)))
;; (vector-ref (vector-ref rinfo 1) 3)))
;; (test "get runname from id" "firstrun" (rmt:get-run-name-from-id 1))
;;
;; ;; TESTS
;; (test "get tests (no data)" '() (rmt:get-tests-for-run 1 "%" '() '() #f #f #f #f #f #f))
;; (test "register test" #t (rmt:general-call 'register-test 1 1 "test1" ""))
;; (test "get tests (some data)" 1 (length (rmt:get-tests-for-run 1 "%" '() '() #f #f #f #f #f #f)))
;; (test "get test id" 1 (rmt:get-test-id 1 "test1" ""))
;;
;; (test "sync back" #t (> (rmt:sync-inmem->db) 0))
;; (test "get test id from main" 1 (db:get-test-id *db* 1 "test1" ""))
;;
;; (test "get keys" #t (list? (rmt:get-keys)))
;; (test "set comment" #t (begin (rmt:general-call 'set-test-comment 1 "this is a comment" 1) #t))
;; (test "get comment" "this is a comment" (let ((trec (rmt:get-test-info-by-id 1 1)))
;; (db:test-get-comment trec)))
;;
;; ;; MORE RUNS
;; (test "get runs" #t (let* ((runs (rmt:get-runs "%" #f #f '()))
;; (header (vector-ref runs 0))
;; (data (vector-ref runs 1)))
;; (and (list? header)
;; (list? data)
;; (vector? (car data)))))
;;
;; (test "get local testinfo" "test1" (vector-ref (db:get-testinfo-state-status *db* 1 1) 2))
;; (test "get testinfo" "test1" (vector-ref (rmt:get-testinfo-state-status 1 1) 2))
;;
;; ;;======================================================================
;; ;; D B
;; ;;======================================================================
;;
;; (test "pass fail counts" #t (rmt:general-call 'pass-fail-counts 10 9 1))
;; (test "get pass fail counts" 19 (let ((dat (rmt:get-test-info-by-id 1)))
;; (+ (db:test-get-pass_count dat)
;; (db:test-get-fail_count dat))))
;;
;; (define testregistry (make-hash-table))
;; (for-each
;; (lambda (tname)
;; (for-each
;; (lambda (itempath)
;; (let ((tkey (conc tname "/" itempath))
;; (rpass (random 10))
;; (rfail (random 10)))
;; (hash-table-set! testregistry tkey (list tname itempath))
;; (rmt:general-call 'register-test 1 tname itempath)
;; (let* ((tid (rmt:get-test-id 1 tname itempath))
;; (tdat (rmt:get-test-info-by-id tid)))
;; (rmt:general-call 'pass-fail-counts rpass rfail (db:test-get-id tdat))
;; (let* ((resdat (rmt:get-test-info-by-id tid)))
;; (test "set/get pass fail counts" (list rpass rfail)
;; (list (db:test-get-pass_count resdat)
;; (db:test-get-fail_count resdat)))))))
;; (list "" "a" "b" "c" "d" "e" "f" "g" "h" "i" "j")))
;; (list "test1" "test2" "test3" "test4" "test5"))
;;
;;
;; (test #f '(#t "exit process started") (rmt:kill-server)) ;; *toppath* *my-client-signature* #f)))
;;
|