Overview
Comment: | diff report presentation complete. CLI in progress |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.63-xor-report |
Files: | files | file ages | folders |
SHA1: |
234b912257ad291ecf510c02919b23bc |
User & Date: | bjbarcla on 2017-01-25 12:55:44 |
Other Links: | branch diff | manifest | tags |
Context
2017-01-31
| ||
17:47 | completed diff report feature check-in: 118224962b user: bjbarcla tags: v1.63-xor-report | |
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
| ||
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 | |
Changes
Modified diff-report.scm from [fe2161c6c9] to [7e5991ad84].
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 | ;; #;; (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 "") | > | | | | | | | | | | > > | | | | | | | < < | < < | | 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 | ;; #;; (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 fmt) (use ducttape-lib) (define css "") (define (diff: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))) (hash-table-set! res test-name+item-path value))) tests-mindat) res)) ;; return 1 if status1 is better ;; return 0 if status1 and 2 are equally good ;; return -1 if status2 is better (define (diff:status-compare3 status1 status2) (let* ((status-goodness-ranking (list "PASS" "WARN" "WAIVED" "SKIP" "FAIL" "ABORT" #f)) (mem1 (member status1 status-goodness-ranking)) (mem2 (member status2 status-goodness-ranking)) ) (cond ((and (not mem1) (not mem2)) 0) ((not mem1) -1) ((not mem2) 1) ((= (length mem1) (length mem2)) 0) ((> (length mem1) (length mem2)) 1) (else -1)))) (define (diff:xor-tests-mindat src-tests-mindat dest-tests-mindat #!key (hide-clean #f) (consistent-fail-not-clean #f)) (let* ((src-hash (diff:tests-mindat->hash src-tests-mindat)) (dest-hash (diff:tests-mindat->hash dest-tests-mindat)) (all-keys (reverse (sort (delete-duplicates (append (hash-table-keys src-hash) (hash-table-keys dest-hash))) (lambda (a b) (cond ((< 0 (string-compare3 (car a) (car b))) #t) ((> 0 (string-compare3 (car a) (car b))) #f) ((< 0 (string-compare3 (cdr a) (cdr b))) #t) (else #f))) )))) (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 0 "NULL" "NULL"))) ;; (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 0 "NULL" "NULL"))) ;; (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 (diff: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 "NOT-IN-DEST" "DEST-INCOMPLETE") src-value dest-value) ((not src-complete) (list dest-test-id "NOT-IN-SRC" "SRC-INCOMPLETE") src-value dest-value) ((and (equal? src-state dest-state) (equal? src-status dest-status)) (if (and consistent-fail-not-clean (not (member dest-status '("PASS" "SKIP" "WAIVED" "WARN")))) (list dest-test-id (conc "BOTH-BAD") (conc "CLEAN-" dest-status) src-value dest-value) (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 "WORSE" (conc src-status "->" dest-status) src-value dest-value)) (else (list dest-test-id "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 (equal? "CLEAN" (list-ref (list-ref item 2) 1)))) res) res)))) (define (diff:run-name->run-id run-name) (if (number? run-name) run-name (let* ((qry-res (rmt:get-runs run-name 1 0 '()))) (if (eq? 2 (vector-length qry-res)) (vector-ref (car (vector-ref qry-res 1)) 1) #f)))) (define (diff:run-id->tests-mindat run-id #!key (testpatt "%/%")) (let* ((states '()) (statuses '()) (offset #f) (limit #f) (not-in #t) (sort-by #f) (sort-order #f) (qryvals "id,testname,item_path,state,status") |
︙ | ︙ | |||
170 171 172 173 174 175 176 | offset limit not-in sort-by sort-order qryvals last-update mode)))) | | | | | | > > > > > > > > | > | | | > > > > > > > > > > > > > | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > | | > > > > | | | > > > > > > > > > > > > > > > | | | | | | > | | | | | | > > > > > > | | > > | | > > | > | > > | < < < < | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 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 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 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 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 358 359 360 361 362 363 364 365 366 367 368 369 370 | offset limit not-in sort-by sort-order qryvals last-update mode)))) (define (diff:diff-runs src-run-id dest-run-id) (let* ((src-tests-mindat (diff:run-id->tests-mindat src-run-id)) (dest-tests-mindat (diff:run-id->tests-mindat dest-run-id))) (diff:xor-tests-mindat src-tests-mindat dest-tests-mindat consistent-fail-not-clean: #t))) (define (diff:rundiff-find-by-state run-diff state) (filter (lambda (x) (equal? (list-ref (caddr x) 1) state)) run-diff)) (define (diff:rundiff-clean-breakdown run-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))) (list test-name item-path "CLEAN" src-status)) (else ""))) (diff:rundiff-find-by-state run-diff "CLEAN"))) (define (diff:summarize-run-diff run-diff) (let* ((diff-states (list "CLEAN" "BETTER" "WORSE" "BOTH-BAD" "NOT-IN-DEST" "NOT-IN-SRC" ))) (map (lambda (state) (list state (length (diff:rundiff-find-by-state run-diff state)))) diff-states))) (define (diff:stml->string in-stml) (with-output-to-string (lambda () (s:output-new (current-output-port) in-stml)))) (define (diff:state-status->bgcolor state status) (match (list state status) (("CLEAN" _) "#88ff88") (("BETTER" _) "#33ff33") (("WORSE" _) "#ff3333") (("BOTH-BAD" _) "#ff3333") ((_ "WARN") "#ffff88") ((_ "FAIL") "#ff8888") ((_ "ABORT") "#ff0000") ((_ "PASS") "#88ff88") ((_ "SKIP") "#ffff00") (else "#ffffff"))) (define (diff:test-state-status->diff-report-cell state status) (s:td 'bgcolor (diff:state-status->bgcolor state status) status)) (define (diff:diff-state-status->diff-report-cell state status) (s:td state 'bgcolor (diff:state-status->bgcolor state status))) (define (diff:megatest-html-logo) "<pre> ___ ___ _ _ | \\/ | ___ __ _ __ _| |_ ___ ___| |_ | |\\/| |/ _ \\/ _` |/ _` | __/ _ \\/ __| __| | | | | __/ (_| | (_| | || __/\\__ \\ |_ |_| |_|\\___|\\__, |\\__,_|\\__\\___||___/\\__| |___/ </pre>") (define (diff:megatest-html-diff-logo) "<pre> ___ ___ _ _ | \\/ | ___ __ _ __ _| |_ ___ ___| |_ | _ \\(_)/ _|/ _| | |\\/| |/ _ \\/ _` |/ _` | __/ _ \\/ __| __| | | | | | |_| |_ | | | | __/ (_| | (_| | || __/\\__ \\ |_ | |_| | | _| _| |_| |_|\\___|\\__, |\\__,_|\\__\\___||___/\\__| |____/|_|_| |_| |___/ </pre>") (define (diff:run-id->target+run-name+starttime run-id) (let* ((target (rmt:get-target run-id)) (runinfo (rmt:get-run-info run-id)) ; vector of header (list) and result (vector) (info-hash (alist->hash-table (map (lambda (x) (cons (car x) (cadr x))) ; make it a useful hash (zip (vector-ref runinfo 0) (vector->list (vector-ref runinfo 1)))))) (run-name (hash-table-ref/default info-hash "runname" "N/A")) (start-time (hash-table-ref/default info-hash "event_time" 0))) (list target run-name start-time))) (define (diff:run-diff->diff-report src-run-id dest-run-id run-diff) (let* ((src-info (diff:run-id->target+run-name+starttime src-run-id)) (src-target (car src-info)) (src-run-name (cadr src-info)) (src-start (conc (seconds->string (caddr src-info)) " " (local-timezone-abbreviation))) (dest-info (diff:run-id->target+run-name+starttime dest-run-id)) (dest-target (car dest-info)) (dest-run-name (cadr dest-info)) (dest-start (conc (seconds->string (caddr dest-info)) " " (local-timezone-abbreviation))) (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 (diff:diff-state-status->diff-report-cell (car state-count) #f) (s:td 'align "right" (fmt #f (decimal-align 3 (fix 2 (num/fit 6 (* 100 (/ (cadr state-count) test-count))))))) (s:td 'align "right" (cadr state-count)))) (diff:summarize-run-diff run-diff)))) (meta-table (s:table 'cellspacing "0" 'border "1" (s:tr (s:td 'colspan "2" (s:table 'cellspacing "0" 'border "1" (s:tr (s:th 'align "LEFT" "") (s:th "SOURCE RUN") (s:th "DESTINATION RUN")) (s:tr (s:th 'align "LEFT" "Started") (s:td src-start) (s:td dest-start)) (s:tr (s:th 'align "LEFT" "TARGET") (s:td src-target) (s:td dest-target)) (s:tr (s:th 'align "LEFT" "RUN NAME") (s:td src-run-name) (s:td dest-run-name))))))) (main-table (apply s:table 'cellspacing "0" 'border "1" (s:tr (s:th "Test name") (s:th "Item Path") (s:th (conc "SOURCE")) (s:th (conc "DEST")) (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) (diff:test-state-status->diff-report-cell src-state src-status) (diff:test-state-status->diff-report-cell dest-state dest-status) (diff: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))))) (diff:stml->string (s:body (diff:megatest-html-diff-logo) (s:h2 "Summary") (s:table 'border "0" (s:tr (s:td "Diff calculated at") (s:td (conc (seconds->string) " " (local-timezone-abbreviation)))) (s:tr (s:td "MT_RUN_AREA_HOME" ) (s:td *toppath*)) (s:tr 'valign "TOP" (s:td summary-table) (s:td meta-table))) (s:h2 "Diffs + consistently failing tests") main-table)))) (let* ((src-run-name "all57") (dest-run-name "all60") (src-run-id (diff:run-name->run-id src-run-name)) (dest-run-id (diff:run-name->run-id dest-run-name)) (to "bjbarcla") (subj (conc "[MEGATEST DIFF] "src-run-name" vs. "dest-run-name)) (run-diff (diff:diff-runs src-run-id dest-run-id )) (diff-summary (diff:summarize-run-diff run-diff)) (email-body (diff:run-diff->diff-report src-run-id dest-run-id run-diff))) ;;(pretty-print run-diff) ;;(pretty-print diff-summary) ;;(with-output-to-file "/tmp/bjbarcla/foo.html" (lambda () (print email-body))) (sendmail to subj email-body use_html: #t) ;;(print html-report) ) |