From d19095947f3d05ac5603c3d1b9ebceb9bb7690a9 Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Wed, 6 Jun 2018 14:00:04 -0400 Subject: [PATCH] Bug 1417920 - [python-test] Use a global pytest.ini configuration file, r=davehunt This changes two config options: pytest_classes = PyTest # only classes that start with 'PyTest' will be considered tests (previously this was Test) xfail_strict = true # tests marked as xfail will cause pytest to return non-zero if they unexpectedly pass MozReview-Commit-ID: DCWoDFbe6Mk --HG-- extra : rebase_source : 9aa806e035d62d51bb338708396851c40f55ee00 --- config/mozunit/mozunit/mozunit.py | 3 +++ config/mozunit/mozunit/pytest.ini | 3 +++ .../harness/marionette_harness/tests/harness_unit/pytest.ini | 2 -- .../marionette_harness/tests/harness_unit/test_httpd.py | 2 +- .../tests/harness_unit/test_marionette_arguments.py | 2 +- .../tests/harness_unit/test_marionette_harness.py | 2 +- .../tests/harness_unit/test_marionette_runner.py | 2 +- .../tests/harness_unit/test_marionette_test_result.py | 2 +- .../marionette_harness/tests/harness_unit/test_serve.py | 2 +- tools/lint/test/test_flake8.py | 5 ++--- 10 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 config/mozunit/mozunit/pytest.ini delete mode 100644 testing/marionette/harness/marionette_harness/tests/harness_unit/pytest.ini diff --git a/config/mozunit/mozunit/mozunit.py b/config/mozunit/mozunit/mozunit.py index 40ba2451aa76..b10a1d8a935b 100644 --- a/config/mozunit/mozunit/mozunit.py +++ b/config/mozunit/mozunit/mozunit.py @@ -12,6 +12,8 @@ from unittest import TextTestRunner as _TestRunner, TestResult as _TestResult import pytest import six +here = os.path.abspath(os.path.dirname(__file__)) + StringIO = six.StringIO '''Helper to make python unit tests report the way that the Mozilla @@ -232,6 +234,7 @@ def main(*args, **kwargs): module = __import__('__main__') args.extend([ + '-c', os.path.join(here, 'pytest.ini'), '-vv', '-p', 'mozlog.pytest_mozlog.plugin', '-p', 'no:cacheprovider', diff --git a/config/mozunit/mozunit/pytest.ini b/config/mozunit/mozunit/pytest.ini new file mode 100644 index 000000000000..97147209ecd8 --- /dev/null +++ b/config/mozunit/mozunit/pytest.ini @@ -0,0 +1,3 @@ +[pytest] +python_classes=PyTest +xfail_strict=true diff --git a/testing/marionette/harness/marionette_harness/tests/harness_unit/pytest.ini b/testing/marionette/harness/marionette_harness/tests/harness_unit/pytest.ini deleted file mode 100644 index b38805ea8c5b..000000000000 --- a/testing/marionette/harness/marionette_harness/tests/harness_unit/pytest.ini +++ /dev/null @@ -1,2 +0,0 @@ -[pytest] -addopts = -p no:terminalreporter diff --git a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_httpd.py b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_httpd.py index e55e7a0d5463..653023ec6102 100644 --- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_httpd.py +++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_httpd.py @@ -89,4 +89,4 @@ def test_handler(server): if __name__ == "__main__": - mozunit.main('--log-tbpl=-') + mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-') diff --git a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_arguments.py b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_arguments.py index dfa1f81ebd89..4b0a7574590f 100644 --- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_arguments.py +++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_arguments.py @@ -66,4 +66,4 @@ def test_parse_opt_args_emulator(mach_parsed_kwargs, arg_name, arg_dest, arg_val if __name__ == '__main__': - mozunit.main('--log-tbpl=-') + mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-') diff --git a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_harness.py b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_harness.py index 9f3b36d438cc..a49ce94e3a46 100644 --- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_harness.py +++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_harness.py @@ -107,4 +107,4 @@ def test_harness_sets_up_default_test_handlers(mach_parsed_kwargs): if __name__ == '__main__': - mozunit.main('--log-tbpl=-') + mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-') diff --git a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py index bfadac8c7a05..4f31c4f2671b 100644 --- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py +++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py @@ -507,4 +507,4 @@ def test_option_run_until_failure(mach_parsed_kwargs, repeat, run_until_failure) if __name__ == '__main__': - mozunit.main('--log-tbpl=-') + mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-') diff --git a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_test_result.py b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_test_result.py index 840e1f12e230..645124453df1 100644 --- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_test_result.py +++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_test_result.py @@ -53,4 +53,4 @@ def test_crash_is_recorded_as_error(empty_marionette_test, if __name__ == '__main__': - mozunit.main('--log-tbpl=-') + mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-') diff --git a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_serve.py b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_serve.py index 9177166e78c1..87948204621f 100644 --- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_serve.py +++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_serve.py @@ -66,4 +66,4 @@ def test_where_is(): if __name__ == "__main__": - mozunit.main('--log-tbpl=-') + mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-') diff --git a/tools/lint/test/test_flake8.py b/tools/lint/test/test_flake8.py index 04a724b28cf1..cfb23a816071 100644 --- a/tools/lint/test/test_flake8.py +++ b/tools/lint/test/test_flake8.py @@ -67,14 +67,13 @@ foo = ['A list of strings', 'that go over 80 characters', 'to test if autopep8 f assert fh.read() == contents -@pytest.mark.xfail( - strict=True, reason="Bug 1277851 - custom configs are ignored if specifying a parent path") +@pytest.mark.xfail(reason="Bug 1277851 - custom configs are ignored if specifying a parent path") def test_lint_custom_config_from_parent_path(lint, paths): results = lint(paths(), collapse_results=True) assert paths('custom/good.py')[0] not in results -@pytest.mark.xfail(strict=True, reason="Bug 1277851 - 'exclude' argument is ignored") +@pytest.mark.xfail(reason="Bug 1277851 - 'exclude' argument is ignored") def test_lint_excluded_file(lint, paths): paths = paths('bad.py') results = lint(paths, exclude=paths)