Auto merge of #18724 - mrobinson:test-runner-count, r=jdm

Fix the test count in the WPT grouping_formatter

The internal WPT API seems to have changed again, so we must revert the
previous change here to get the correct test count.

<!-- 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 this is a change to the test harness runner script.

<!-- 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/18724)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-04 13:54:47 -05:00 committed by GitHub
commit d8c7066464

View file

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