Auto merge of #18992 - mrobinson:formatter, r=jgraham

Fix the test count in grouping formatter

Now that the WPT update has settled a bit, it seems safe to make sure
that the grouping_formatter properly consumes the data structure
provided.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they fix an issue in the python test harness.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18992)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-23 12:08:28 -05:00 committed by GitHub
commit f1603b9e71

View file

@ -105,7 +105,7 @@ class GroupingFormatter(base.BaseFormatter):
return new_display + "No tests running.\n" return new_display + "No tests running.\n"
def suite_start(self, data): def suite_start(self, data):
self.number_of_tests = len(data["tests"]) self.number_of_tests = sum(len(tests) for tests in data["tests"].itervalues())
self.start_time = data["time"] self.start_time = data["time"]
if self.number_of_tests == 0: if self.number_of_tests == 0: