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/test_pluginmanager.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/test_pluginmanager.py')
| -rw-r--r-- | testing/test_pluginmanager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/test_pluginmanager.py b/testing/test_pluginmanager.py index 56d5a7625..3b8351209 100644 --- a/testing/test_pluginmanager.py +++ b/testing/test_pluginmanager.py @@ -71,7 +71,7 @@ class TestPytestPluginInteractions: values = [] class A: - def pytest_configure(self, config): + def pytest_configure(self): values.append(self) config.pluginmanager.register(A()) |