|
10 | 10 | importos |
11 | 11 | fromcollectionsimportdefaultdict |
12 | 12 |
|
13 | | - |
14 | | -html_template="""<html><head><style media="screen" type="text/css"> |
| 13 | +# Non-png image extensions |
| 14 | +NON_PNG_EXTENSIONS= ['pdf','svg','eps'] |
| 15 | + |
| 16 | +html_template="""<!DOCTYPE html> |
| 17 | +<html lang="en"><head> |
| 18 | +<meta charset="utf-8"> |
| 19 | +<title>Matplotlib test result visualization</title> |
| 20 | +<style media="screen"> |
15 | 21 | img{{ |
16 | 22 | width:100%; |
17 | 23 | max-width:800px; |
|
24 | 30 | """ |
25 | 31 |
|
26 | 32 | subdir_template="""<h2>{subdir}</h2><table> |
27 | | -<thead><td>name</td><td>actual</td><td>expected</td><td>diff</td></thead> |
| 33 | +<thead><tr><th>name</th><th>actual</th><th>expected</th><th>diff</th></tr></thead> |
| 34 | +<tbody> |
28 | 35 | {rows} |
| 36 | +</tbody> |
29 | 37 | </table> |
30 | 38 | """ |
31 | 39 |
|
32 | 40 | failed_template="""<h2>Only Failed</h2><table> |
33 | | -<thead><td>name</td><td>actual</td><td>expected</td><td>diff</td></thead> |
| 41 | +<thead><tr><th>name</th><th>actual</th><th>expected</th><th>diff</th></tr></thead> |
| 42 | +<tbody> |
34 | 43 | {rows} |
| 44 | +</tbody> |
35 | 45 | </table> |
36 | 46 | """ |
37 | 47 |
|
@@ -68,28 +78,41 @@ def run(show_browser=True): |
68 | 78 | fn,fext=os.path.splitext(file) |
69 | 79 | iffext!=".png": |
70 | 80 | continue |
71 | | -# Always use / for URLs. |
72 | 81 | if"-failed-diff"infn: |
73 | | -pictures[fn[:-12]]["f"]="/".join((subdir,file)) |
| 82 | +file_type='diff' |
| 83 | +test_name=fn[:-len('-failed-diff')] |
74 | 84 | elif"-expected"infn: |
75 | | -pictures[fn[:-9]]["e"]="/".join((subdir,file)) |
| 85 | +forextinNON_PNG_EXTENSIONS: |
| 86 | +iffn.endswith(f'_{ext}'): |
| 87 | +display_extension=f'_{ext}' |
| 88 | +extension=ext |
| 89 | +fn=fn[:-len(display_extension)] |
| 90 | +break |
| 91 | +else: |
| 92 | +display_extension='' |
| 93 | +extension='png' |
| 94 | +file_type='expected' |
| 95 | +test_name=fn[:-len('-expected')]+display_extension |
76 | 96 | else: |
77 | | -pictures[fn]["c"]="/".join((subdir,file)) |
| 97 | +file_type='actual' |
| 98 | +test_name=fn |
| 99 | +# Always use / for URLs. |
| 100 | +pictures[test_name][file_type]='/'.join((subdir,file)) |
78 | 101 |
|
79 | 102 | subdir_rows= [] |
80 | 103 | forname,testinsorted(pictures.items()): |
81 | | -expected_image=test.get('e','') |
82 | | -actual_image=test.get('c','') |
| 104 | +expected_image=test.get('expected','') |
| 105 | +actual_image=test.get('actual','') |
83 | 106 |
|
84 | | -if'f'intest: |
| 107 | +if'diff'intest: |
85 | 108 | # A real failure in the image generation, resulting in |
86 | 109 | # different images. |
87 | 110 | status=" (failed)" |
88 | | -failed=f'<a href="{test["f"]}">diff</a>' |
| 111 | +failed=f'<a href="{test["diff"]}">diff</a>' |
89 | 112 | current=linked_image_template.format(actual_image) |
90 | 113 | failed_rows.append(row_template.format(name,"",current, |
91 | 114 | expected_image,failed)) |
92 | | -elif'c'notintest: |
| 115 | +elif'actual'notintest: |
93 | 116 | # A failure in the test, resulting in no current image |
94 | 117 | status=" (failed)" |
95 | 118 | failed='--' |
|