Skip to content

Commit

Permalink
Fix tests for pytest features branch
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoddemus committed Nov 4, 2019
1 parent f7e7d87 commit 0c53761
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions testing/acceptance_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ def test_func(request):
)
)
result = testdir.runpytest(n)
result.stdout.fnmatch_lines(["*this is a warning*", "*1 passed, 1 warnings*"])
result.stdout.fnmatch_lines(["*this is a warning*", "*1 passed, 1 warning*"])

@pytest.mark.parametrize("n", ["-n0", "-n1"])
def test_custom_subclass(self, testdir, n):
Expand All @@ -808,7 +808,7 @@ def test_func(request):
)
testdir.syspathinsert()
result = testdir.runpytest(n)
result.stdout.fnmatch_lines(["*MyWarning*", "*1 passed, 1 warnings*"])
result.stdout.fnmatch_lines(["*MyWarning*", "*1 passed, 1 warning*"])

@pytest.mark.parametrize("n", ["-n0", "-n1"])
def test_unserializable_arguments(self, testdir, n):
Expand All @@ -825,7 +825,7 @@ def test_func(tmpdir):
)
testdir.syspathinsert()
result = testdir.runpytest(n)
result.stdout.fnmatch_lines(["*UserWarning*foo.txt*", "*1 passed, 1 warnings*"])
result.stdout.fnmatch_lines(["*UserWarning*foo.txt*", "*1 passed, 1 warning*"])

@pytest.mark.parametrize("n", ["-n0", "-n1"])
def test_unserializable_warning_details(self, testdir, n):
Expand Down Expand Up @@ -857,7 +857,7 @@ def test_func(tmpdir):
testdir.syspathinsert()
result = testdir.runpytest(n)
result.stdout.fnmatch_lines(
["*ResourceWarning*unclosed*", "*1 passed, 1 warnings*"]
["*ResourceWarning*unclosed*", "*1 passed, 1 warning*"]
)


Expand Down

0 comments on commit 0c53761

Please sign in to comment.