diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-06-04 10:41:36 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-06-04 10:41:36 -0500 |
| commit | ccfe29d8f284dedc0101045d574a98fb1f69aa62 (patch) | |
| tree | 142dede44fd14791dd32d80a734a85f9c9335349 /python/servo/testing_commands.py | |
| parent | 610de77e23626c68cbdc334eb84da468517e1c07 (diff) | |
| parent | 848c57653ce1b023a324fb9442059228f5372188 (diff) | |
| download | servo-ccfe29d8f284dedc0101045d574a98fb1f69aa62.tar.gz servo-ccfe29d8f284dedc0101045d574a98fb1f69aa62.zip | |
Auto merge of #6279 - frewsxcv:flake8, r=jdm
Fixes #6236
Also included in this commit are the changes need to make flake8 pass
for the existing python file
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6279)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/testing_commands.py')
| -rw-r--r-- | python/servo/testing_commands.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 2274c84c8ed..5d656b2bc97 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -281,7 +281,6 @@ class MachCommands(CommandBase): execfile(run_file, run_globals) return run_globals["update_tests"](**kwargs) - def ensure_wpt_virtualenv(self): virtualenv_path = path.join("tests", "wpt", "_virtualenv") python = self.get_exec("python2", "python") @@ -295,8 +294,8 @@ class MachCommands(CommandBase): execfile(activate_path, dict(__file__=activate_path)) try: - import wptrunner - from wptrunner.browsers import servo + import wptrunner # noqa + from wptrunner.browsers import servo # noqa except ImportError: subprocess.check_call(["pip", "install", "-r", path.join("tests", "wpt", "harness", "requirements.txt")]) @@ -311,7 +310,7 @@ class MachCommands(CommandBase): # before the virtualenv is initalised it doesn't see the blessings module so we don't # get coloured output. Setting the blessings global explicitly fixes that. from mozlog.structured.formatters import machformatter - import blessings + import blessings # noqa machformatter.blessings = blessings def get_exec(self, name, default=None): |