diff options
| author | Bruno Oliveira <nicoddemus@gmail.com> | 2018-11-13 09:00:59 -0200 |
|---|---|---|
| committer | Bruno Oliveira <nicoddemus@gmail.com> | 2018-11-13 09:01:37 -0200 |
| commit | 557cb6cffe0dde3d11affa5da2286353417b6893 (patch) | |
| tree | 502cef8bfeca4d0d1b08dbc69cb6e26b31e8afed /testing/test_session.py | |
| parent | 8198e7cd33d5ddb55231d3fab58511003dcdbaef (diff) | |
| parent | 243d898b38d3e52523772dd619af66c82b955e97 (diff) | |
| download | pytest-557cb6cffe0dde3d11affa5da2286353417b6893.tar.gz | |
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
Diffstat (limited to 'testing/test_session.py')
| -rw-r--r-- | testing/test_session.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/testing/test_session.py b/testing/test_session.py index fed39195c..e2c3701da 100644 --- a/testing/test_session.py +++ b/testing/test_session.py @@ -333,7 +333,11 @@ def test_rootdir_option_arg(testdir, monkeypatch, path): result = testdir.runpytest("--rootdir={}".format(path)) result.stdout.fnmatch_lines( - ["*rootdir: {}/root, inifile:*".format(testdir.tmpdir), "*1 passed*"] + [ + "*rootdir: {}/root, inifile:*".format(testdir.tmpdir), + "root/test_rootdir_option_arg.py *", + "*1 passed*", + ] ) |