Overview
Comment: | added ducttape lib; got emailing html report working and first pass stml tables for diff report |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.63-xor-report |
Files: | files | file ages | folders |
SHA1: |
f2807ed766e6e30ce5d5e45f4fed1e3b |
User & Date: | bjbarcla on 2017-01-24 11:52:44 |
Other Links: | branch diff | manifest | tags |
Context
2017-01-25
| ||
12:55 | diff report presentation complete. CLI in progress check-in: 234b912257 user: bjbarcla tags: v1.63-xor-report | |
2017-01-24
| ||
12:14 | Automated merge of v1.63-xor-report/f2807ed766/integ into integ-home check-in: 4008bc5f1a user: matt tags: integ-home | |
11:52 | added ducttape lib; got emailing html report working and first pass stml tables for diff report check-in: f2807ed766 user: bjbarcla tags: v1.63-xor-report | |
2017-01-23
| ||
13:10 | wip check-in: d46b48da54 user: bjbarcla tags: v1.63-xor-report | |
Changes
Modified diff-report.scm from [5fd2239c5e] to [fe2161c6c9].
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ;; #;; (rmt:get-test-info-by-id run-id test-id) ;; #;; (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode) ;; megatest -repl << EOF ;; TODO:dashboard not on homehost message exit (define (tests-mindat->hash tests-mindat) (let* ((res (make-hash-table))) (for-each (lambda (item) (let* ((test-name+item-path (cons (list-ref item 0) (list-ref item 1))) (value (list-ref item 2))) | > > > > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | ;; #;; (rmt:get-test-info-by-id run-id test-id) ;; #;; (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode) ;; megatest -repl << EOF ;; TODO:dashboard not on homehost message exit (use matchable) (use ducttape-lib) (define css "") (define (tests-mindat->hash tests-mindat) (let* ((res (make-hash-table))) (for-each (lambda (item) (let* ((test-name+item-path (cons (list-ref item 0) (list-ref item 1))) (value (list-ref item 2))) |
︙ | ︙ | |||
61 62 63 64 65 66 67 | )))) (let ((res (map ;; TODO: rename xor to delta globally in dcommon and dashboard (lambda (key) (let* ((test-name (car key)) (item-path (cdr key)) | | | | | | | | | | | | | | | < | 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 | )))) (let ((res (map ;; TODO: rename xor to delta globally in dcommon and dashboard (lambda (key) (let* ((test-name (car key)) (item-path (cdr key)) (dest-value (hash-table-ref/default dest-hash key (list #f #f #f))) ;; (list test-id state status) (dest-test-id (list-ref dest-value 0)) (dest-state (list-ref dest-value 1)) (dest-status (list-ref dest-value 2)) (src-value (hash-table-ref/default src-hash key (list #f #f #f))) ;; (list test-id state status) (src-test-id (list-ref src-value 0)) (src-state (list-ref src-value 1)) (src-status (list-ref src-value 2)) (incomplete-statuses '("DELETED" "INCOMPLETE" "STUCK/DEAD" "N/A")) ;; if any of these statuses apply, treat test as incomplete (dest-complete (and dest-value dest-state dest-status (equal? dest-state "COMPLETED") (not (member dest-status incomplete-statuses)))) (src-complete (and src-value src-state src-status (equal? src-state "COMPLETED") (not (member src-status incomplete-statuses)))) (status-compare-result (status-compare3 src-status dest-status)) (xor-new-item (cond ;; complete, for this case means: state=compelte AND status not in ( deleted uncomplete stuck/dead n/a ) ;; neither complete -> bad ;; src !complete, dest complete -> better ((and (not dest-complete) (not src-complete)) (list dest-test-id "BOTH-BAD" "BOTH-INCOMPLETE") src-value dest-value) ((not dest-complete) (list src-test-id "DIFF-MISSING" "DEST-INCOMPLETE") src-value dest-value) ((not src-complete) (list dest-test-id "DIFF-NEW" "SRC-INCOMPLETE") src-value dest-value) ((and (equal? src-state dest-state) (equal? src-status dest-status)) (list dest-test-id (conc "CLEAN") (conc "CLEAN-" dest-status) src-value dest-value)) ;; better or worse: pass > warn > waived > skip > fail > abort ;; pass > warn > waived > skip > fail > abort ((= 1 status-compare-result) ;; src is better, dest is worse (list dest-test-id "DIRTY-WORSE" (conc src-status "->" dest-status) src-value dest-value)) (else (list dest-test-id "DIRTY-BETTER" (conc src-status "->" dest-status) src-value dest-value))))) (list test-name item-path xor-new-item))) all-keys))) (if hide-clean (filter (lambda (item) (not |
︙ | ︙ | |||
182 183 184 185 186 187 188 | (lambda (x) (equal? (list-ref (caddr x) 1) state)) run-diff)) (define (summarize-run-diff run-diff) (let* ((diff-states (list "CLEAN" "DIRTY-BETTER" "DIRTY-WORSE" "BOTH-BAD" "DIFF-MISSING" "DIFF-NEW" ))) | | | | > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > | > > | > > > | > | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 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 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | (lambda (x) (equal? (list-ref (caddr x) 1) state)) run-diff)) (define (summarize-run-diff run-diff) (let* ((diff-states (list "CLEAN" "DIRTY-BETTER" "DIRTY-WORSE" "BOTH-BAD" "DIFF-MISSING" "DIFF-NEW" ))) (map (lambda (state) (list state (length (rundiff-find-by-state run-diff state)))) diff-states))) (define (stml->string in-stml) (with-output-to-string (lambda () (s:output-new (current-output-port) in-stml)))) (define (test-state-status->diff-report-cell state status) (s:td status)) (define (diff-state-status->diff-report-cell state status) (s:td state 'bgcolor "#33ff33")) (define (run-diff->diff-report src-runname dest-runname run-diff) (let* ((test-count (length run-diff)) (summary-table (apply s:table 'cellspacing "0" 'border "1" (s:tr (s:th "Diff type") (s:th "% share") (s:th "Count")) (map (lambda (state-count) (s:tr (s:td (car state-count)) (s:td (* 100 (/ (cadr state-count) test-count))) (s:td (cadr state-count)))) (summarize-run-diff run-diff)))) (main-table (apply s:table 'cellspacing "0" 'border "1" (s:tr (s:th "Test name") (s:th "Item Path") (s:th (conc "Source=" src-runname)) (s:th (conc "Dest=" dest-runname)) (s:th "Diff")) (map (lambda (run-diff-item) (match run-diff-item ((test-name item-path (junk-id diff-state diff-status (src-test-id src-state src-status) (dest-test-id dest-state dest-status))) (s:tr (s:td test-name) (s:td item-path) (test-state-status->diff-report-cell src-state src-status) (test-state-status->diff-report-cell dest-state dest-status) (diff-state-status->diff-report-cell diff-state diff-status))) (else ""))) (filter (lambda (run-diff-item) (match run-diff-item ((test-name item-path (junk-id diff-state diff-status (src-test-id src-state src-status) (dest-test-id dest-state dest-status))) (not (equal? diff-state "CLEAN"))) (else #f))) run-diff))))) (stml->string (s:body summary-table main-table)))) (let* ((src-runname "all57") (dest-runname "all60") (to "bjbarcla") (subj (conc "[MEGATEST DIFF] "src-runname" vs. "dest-runname)) (run-diff (diff-runs src-runname dest-runname)) (diff-summary (summarize-run-diff run-diff)) (html-report (run-diff->diff-report src-runname dest-runname run-diff))) ;;(pretty-print run-diff) ;;(pretty-print diff-summary) (sendmail to subj html-report use_html: #t) ;;(print html-report) ) ;; (match de ;; ((test-name test-path ( test-id "BOTH-BAD" test-status)) test-path) ;; (else #f)) |