Merge pull request #5653 from blueyed/fix-test

nicoddemus · web-flow · commit 880e36860774 · 2019-07-23T15:09:24.000-03:00
Followup: unittest: handle outcomes.Exit
diff --git a/changelog/5634.bugfix.rst b/changelog/5634.bugfix.rst
@@ -1 +1,2 @@
-``pytest.exit`` and ``bdb.BdbQuit`` are now correctly handled in ``unittest`` cases.
+``pytest.exit`` is now correctly handled in ``unittest`` cases.
+This makes ``unittest`` cases handle ``quit`` from pytest's pdb correctly.
diff --git a/testing/test_unittest.py b/testing/test_unittest.py
@@ -1085,4 +1085,4 @@ def test_should_not_run(self):
     """
     )
     result = testdir.runpytest()
-    result.stdout.fnmatch_lines("*Exit: pytest_exit called*")
+    result.stdout.fnmatch_lines(["*Exit: pytest_exit called*", "*= no tests ran in *"])

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		-``pytest.exit`` and ``bdb.BdbQuit`` are now correctly handled in ``unittest`` cases.
	`1`	+``pytest.exit`` is now correctly handled in ``unittest`` cases.
	`2`	+This makes ``unittest`` cases handle ``quit`` from pytest's pdb correctly.
Original file line number	Diff line number	Diff line change
`@@ -1085,4 +1085,4 @@ def test_should_not_run(self):`
`1085`	`1085`	`"""`
`1086`	`1086`	`)`
`1087`	`1087`	`result = testdir.runpytest()`
`1088`		`- result.stdout.fnmatch_lines("Exit: pytest_exit called")`
	`1088`	`+ result.stdout.fnmatch_lines(["Exit: pytest_exit called", "= no tests ran in "])`