diff options
| author | Daniel Hahler <git@thequod.de> | 2019-08-02 16:20:21 +0200 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2019-08-02 16:52:51 +0200 |
| commit | b5b710b3ae26c6fcc257ace8db94c0ca54340c4e (patch) | |
| tree | b55991e233614d50f2af661e18a9faf9f165a22b /testing/deprecated_test.py | |
| parent | 4abf95ba4fe566ef6deb8ef49e3e82cc22fa9252 (diff) | |
| parent | 0d3958e8dec5f78ed19ba5bc7a00a35f3ea3deb0 (diff) | |
| download | pytest-b5b710b3ae26c6fcc257ace8db94c0ca54340c4e.tar.gz | |
Merge master into features
Several conflicts, mostly due to 2c402f4bd.
Conflicts:
.pre-commit-config.yaml
src/_pytest/outcomes.py
src/_pytest/python_api.py
tox.ini
Diffstat (limited to 'testing/deprecated_test.py')
| -rw-r--r-- | testing/deprecated_test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/deprecated_test.py b/testing/deprecated_test.py index 97b88e939..b8a22428f 100644 --- a/testing/deprecated_test.py +++ b/testing/deprecated_test.py @@ -36,7 +36,7 @@ def test_terminal_reporter_writer_attr(pytestconfig): assert terminal_reporter.writer is terminal_reporter._tw -@pytest.mark.parametrize("plugin", deprecated.DEPRECATED_EXTERNAL_PLUGINS) +@pytest.mark.parametrize("plugin", sorted(deprecated.DEPRECATED_EXTERNAL_PLUGINS)) @pytest.mark.filterwarnings("default") def test_external_plugins_integrated(testdir, plugin): testdir.syspathinsert() |