diff options
| author | Bruno Oliveira <bruno@esss.com.br> | 2020-01-22 11:03:45 -0300 |
|---|---|---|
| committer | Bruno Oliveira <bruno@esss.com.br> | 2020-01-22 11:03:45 -0300 |
| commit | 93b74d28d2ac065d977c78bdc43de09272329412 (patch) | |
| tree | 3987d94f8243d294cec2790ce28973521e029508 /testing/acceptance_test.py | |
| parent | 2f0d0fb349db3776f0951c9e0bc238441f263211 (diff) | |
| parent | 8c4dfca0c174846a49ef74551a0db291aca9c6cd (diff) | |
| download | pytest-93b74d28d2ac065d977c78bdc43de09272329412.tar.gz | |
Merge remote-tracking branch 'upstream/master' into mm
Conflicts:
* src/_pytest/_code/code.py
* src/_pytest/main.py
* testing/python/metafunc.py
* testing/test_parseopt.py
* testing/test_pytester.py
Diffstat (limited to 'testing/acceptance_test.py')
| -rw-r--r-- | testing/acceptance_test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index b7dbcd7c0..68e8a97f8 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -606,7 +606,7 @@ class TestInvocationVariants: def test_equivalence_pytest_pytest(self): assert pytest.main == py.test.cmdline.main - def test_invoke_with_invalid_type(self, capsys): + def test_invoke_with_invalid_type(self): with pytest.raises( TypeError, match="expected to be a list or tuple of strings, got: '-h'" ): @@ -617,7 +617,7 @@ class TestInvocationVariants: assert retcode == ExitCode.NO_TESTS_COLLECTED out, err = capsys.readouterr() - def test_invoke_plugin_api(self, testdir, capsys): + def test_invoke_plugin_api(self, capsys): class MyPlugin: def pytest_addoption(self, parser): parser.addoption("--myopt") |