Auto merge of #15181 - jdm:wptfail, r=SimonSapin

Make test-wpt-failure smoketest work again.

Having this testsuite working would have avoided the issue caused by #15064. This will need to wait until after #15164 is merged, because it picks up the failure that currently exists on master.

<!-- 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/15181)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-01-24 13:16:50 -08:00 committed by GitHub
commit 39b4f19ebb

View file

@ -411,16 +411,13 @@ class MachCommands(CommandBase):
@Command('test-wpt-failure', @Command('test-wpt-failure',
description='Run the tests harness that verifies that the test failures are reported correctly', description='Run the tests harness that verifies that the test failures are reported correctly',
category='testing') category='testing',
def test_wpt_failure(self): parser=create_parser_wpt)
def test_wpt_failure(self, **kwargs):
self.ensure_bootstrapped() self.ensure_bootstrapped()
return not call([ kwargs["pause_after_test"] = False
"bash", kwargs["include"] = ["infrastructure/failing-test.html"]
path.join("tests", "wpt", "run.sh"), return not self._test_wpt(**kwargs)
"--no-pause-after-test",
"--include",
"infrastructure/failing-test.html"
], env=self.build_env())
@Command('test-wpt', @Command('test-wpt',
description='Run the regular web platform test suite', description='Run the regular web platform test suite',