diff options
author | Daniel Hahler <git@thequod.de> | 2019-03-23 11:36:18 +0100 |
---|---|---|
committer | Daniel Hahler <git@thequod.de> | 2019-03-23 11:36:18 +0100 |
commit | 08f3b02dfcfe8f0b41a5c8deb66c897e99196c50 (patch) | |
tree | 14eec90af1e86621e18837cba9b0a59fb94b1c87 /testing/test_skipping.py | |
parent | 15d608867dfa0fea5de4d9385dd2da8191ec0b8c (diff) | |
download | pytest-08f3b02dfcfe8f0b41a5c8deb66c897e99196c50.tar.gz |
tests: fnmatch_lines: use list
For strings fnmatch_lines converts it into a Source objects, splitted on
newlines. This is not necessary here, and it is more consistent to use
lists here in the first place.
Diffstat (limited to 'testing/test_skipping.py')
-rw-r--r-- | testing/test_skipping.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/testing/test_skipping.py b/testing/test_skipping.py index 33878c8f4..e5206a44e 100644 --- a/testing/test_skipping.py +++ b/testing/test_skipping.py @@ -331,7 +331,7 @@ class TestXFail(object): result = testdir.runpytest(p, "-rx") result.stdout.fnmatch_lines(["*XFAIL*test_this*", "*reason:*hello*"]) result = testdir.runpytest(p, "--runxfail") - result.stdout.fnmatch_lines("*1 pass*") + result.stdout.fnmatch_lines(["*1 pass*"]) def test_xfail_imperative_in_setup_function(self, testdir): p = testdir.makepyfile( @@ -477,7 +477,7 @@ class TestXFail(object): % strict ) result = testdir.runpytest(p, "-rxX") - result.stdout.fnmatch_lines("*1 passed*") + result.stdout.fnmatch_lines(["*1 passed*"]) assert result.ret == 0 @pytest.mark.parametrize("strict", [True, False]) @@ -493,7 +493,7 @@ class TestXFail(object): % strict ) result = testdir.runpytest(p, "-rxX") - result.stdout.fnmatch_lines("*1 passed*") + result.stdout.fnmatch_lines(["*1 passed*"]) assert result.ret == 0 @pytest.mark.parametrize("strict_val", ["true", "false"]) @@ -515,7 +515,7 @@ class TestXFail(object): ) result = testdir.runpytest(p, "-rxX") strict = strict_val == "true" - result.stdout.fnmatch_lines("*1 failed*" if strict else "*1 xpassed*") + result.stdout.fnmatch_lines(["*1 failed*" if strict else "*1 xpassed*"]) assert result.ret == (1 if strict else 0) @@ -1130,7 +1130,9 @@ def test_module_level_skip_error(testdir): """ ) result = testdir.runpytest() - result.stdout.fnmatch_lines("*Using pytest.skip outside of a test is not allowed*") + result.stdout.fnmatch_lines( + ["*Using pytest.skip outside of a test is not allowed*"] + ) def test_module_level_skip_with_allow_module_level(testdir): @@ -1147,7 +1149,7 @@ def test_module_level_skip_with_allow_module_level(testdir): """ ) result = testdir.runpytest("-rxs") - result.stdout.fnmatch_lines("*SKIP*skip_module_level") + result.stdout.fnmatch_lines(["*SKIP*skip_module_level"]) def test_invalid_skip_keyword_parameter(testdir): @@ -1164,7 +1166,7 @@ def test_invalid_skip_keyword_parameter(testdir): """ ) result = testdir.runpytest() - result.stdout.fnmatch_lines("*TypeError:*['unknown']*") + result.stdout.fnmatch_lines(["*TypeError:*['unknown']*"]) def test_mark_xfail_item(testdir): |