Skip to content

Show notes for skipped tests if they exist and add support for expectedFailure test results #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 29, 2020
Merged

Show notes for skipped tests if they exist and add support for expectedFailure test results #13

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb88986
Update Bundler version
coolreader18 May 27, 2020
20877cf
Display skip notes for skipped tests
coolreader18 May 27, 2020
cb07a7e
Minify the html tables
coolreader18 May 27, 2020
ddd98cb
Link to the regression tests in some more places
coolreader18 May 28, 2020
1f74097
Update with new test data with expected_failure result types
coolreader18 May 28, 2020
8bab8e7
Add support for expectedFailure test results
coolreader18 May 28, 2020
e6ade81
Tiny update to unittest tutorial
coolreader18 May 28, 2020
37d6700
Update data with num_expected_failures
coolreader18 May 29, 2020
dfbd211
Replace skipped summary color w/ expected failure and failed with ski…
coolreader18 May 29, 2020
dea4d42
'Summary-only' view
coolreader18 May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replace skipped summary color w/ expected failure and failed with ski… 
…pped
  • Loading branch information
@coolreader18
coolreader18 committed May 29, 2020
commit dfbd21107fb28cdc8401bca4947372b8981e4876
28 changes: 14 additions & 14 deletions _includes/regrtest_summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% assign result_total = include.pass | plus: include.skip | plus: include.fail %}
{% assign result_total = include.pass | plus: include.expectedfail | plus: include.skip %}
{% assign pass_percent = include.pass | times: 100.0 | divided_by: result_total | round: 2 %}
{% assign expectedfail_percent = include.expectedfail | times: 100.0 | divided_by: result_total | round: 2 %}
{% assign skip_percent = include.skip | times: 100.0 | divided_by: result_total | round: 2 %}
{% assign fail_percent = include.fail | times: 100.0 | divided_by: result_total | round: 2 %}

{% assign pass_color = "#4c1" %}
{% assign skip_color = "#e4df12" %}
{% assign fail_color = "#fe7d37" %}
{% assign expectedfail_color = "#e4df12" %}
{% assign skip_color = "#fe7d37" %}
{% assign bar_height = "20px" %}

{%if include.svg %}
Expand All @@ -14,16 +14,16 @@
<g shape-rendering="crispEdges">
<rect width="49" height="20" fill="#555" />
<rect x="49" width="65" height="20" fill="{{ pass_color }}" />
<rect x="114" width="65" height="20" fill="{{ skip_color }}" />
<rect x="179" width="65" height="20" fill="{{ fail_color }}" />
<rect x="114" width="65" height="20" fill="{{ expectedfail_color }}" />
<rect x="179" width="65" height="20" fill="{{ skip_color }}" />
</g>
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif"
text-rendering="geometricPrecision" font-size="110">
<text x="255" y="140" transform="scale(.1)"
textLength="390">Results</text>
<text x="805" y="140" transform="scale(.1)" textLength="550">Pass {{ pass_percent | round: 1 }}%</text>
<text x="1455" y="140" transform="scale(.1)" textLength="550">Skip {{ skip_percent | round: 1 }}%</text>
<text x="2105" y="140" transform="scale(.1)" textLength="550">Fail {{ fail_percent | round: 1 }}%</text>
<text x="1455" y="140" transform="scale(.1)" textLength="550">Expected Failure {{ expectedfail_percent | round: 1 }}%</text>
<text x="2105" y="140" transform="scale(.1)" textLength="550">Skip {{ skip_percent | round: 1 }}%</text>
</g>
</svg>

Expand All @@ -50,20 +50,20 @@
<span class="font-secondary">Passed: </span>
{{ include.pass }} ({{ pass_percent }}%)
</div>
<div class ="cell_summary">
<span class="font-secondary">Expected Failure: </span>
{{ include.expectedfail }} ({{ expectedfail_percent }}%)
</div>
<div class="cell_summary">
<span class="font-secondary">Skipped: </span>
{{ include.skip }} ({{ skip_percent }}%)
</div>
<div class ="cell_summary">
<span class="font-secondary">Failed: </span>
{{ include.fail }} ({{ fail_percent }}%)
</div>
</div>
<div class="row"
style="background: linear-gradient(to right,
{{ pass_color }} {{ pass_percent }}%,
{{ skip_color }} {{ pass_percent }}% {{ skip_percent | plus: pass_percent }}%,
{{ fail_color }} {{ skip_percent | plus: pass_percent }}% {{ fail_percent | plus: pass_percent | plus: skip_percent }}%
{{ expectedfail_color }} {{ pass_percent }}% {{ expectedfail_percent | plus: pass_percent }}%,
{{ skip_color }} {{ expectedfail_percent | plus: pass_percent }}% {{ skip_percent | plus: pass_percent | plus: expectedfail_percent }}%
);
height: {{ bar_height }};">

Expand Down
4 changes: 2 additions & 2 deletions _layouts/regrtests_results.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ <h2 class="font-secondary">Summary:</span>
{% assign regrtests_results = site.data.regrtests_results %}
{% include regrtest_summary.html
pass=regrtests_results.num_passed
expectedfail=regrtests_results.num_expected_failures
skip=regrtests_results.num_skipped
fail=regrtests_results.num_failed
extime=regrtests_results.execution_time
%}
</div>
Expand Down Expand Up @@ -78,7 +78,7 @@ <h2 class="font-secondary">Summary:</span>
</div>
{% if result.num_passed and result.num_skipped and result.num_failed %}
<div class="w-md-50 float-md-right">
{% include regrtest_summary.html pass=result.num_passed skip=result.num_skipped fail=result.num_failed extime=result.execution_time %}
{% include regrtest_summary.html pass=result.num_passed expectedfail=result.num_expected_failures skip=result.num_skipped extime=result.execution_time %}
</div>
{% endif %}
</div>
Expand Down