Bug 1253359 - Use vendored Pytest in python-test and Mn harness tests r=gps

In the `python-test` mach command and the mozharness script for
the Marionette harness tests, use the vendored-in Pytest
instead of installing from pip.

Add the Marionette harness test requirements file to the
file_patterns in the definition of the marionette-harness taskcluster
job, as changes to the requirements should trigger the job to run.


MozReview-Commit-ID: J5pln2WB4GY
This commit is contained in:
Anjana Vakil
2016-08-05 20:10:09 +02:00
parent a4a81795f9
commit da012898f8
3 changed files with 4 additions and 8 deletions

View File

@@ -89,8 +89,7 @@ class MachCommands(MachCommandBase):
# is a simple way to keep environments separate, at the price of
# launching Python multiple times. Most tests are run via mozunit,
# which produces output in the format Mozilla infrastructure expects.
# Some tests are run via pytest, and these should be equipped with a
# local mozunit_report plugin to meet output expectations.
# Some tests are run via pytest.
return_code = 0
found_tests = False
if test_objects is None:
@@ -98,9 +97,6 @@ class MachCommands(MachCommandBase):
# test resolution.
if path_only:
if tests:
self.virtualenv_manager.install_pip_package(
'pytest==2.9.1'
)
test_objects = [{'path': p} for p in find_tests_by_path()]
else:
self.log(logging.WARN, 'python-test', {},
@@ -160,4 +156,3 @@ class MachCommands(MachCommandBase):
return 1
return 0 if return_code == 0 else 1