From 539a22c750e2232ca6f0664976a4940e65c48ef5 Mon Sep 17 00:00:00 2001
From: wim glenn <hey@wimglenn.com>
Date: Mon, 20 Aug 2018 01:10:44 -0500
Subject: [PATCH] Added support for xfailed and xpassed outcomes to the
 ``pytester.RunResult.assert_outcomes`` signature.

---
 AUTHORS                    |  1 +
 changelog/3837.feature.rst |  1 +
 src/_pytest/pytester.py    | 18 +++++++++++---
 testing/test_pytester.py   | 51 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 changelog/3837.feature.rst

diff --git a/AUTHORS b/AUTHORS
index 9c3cb6a12..4f7f3fc8b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -213,6 +213,7 @@ Vitaly Lashmanov
 Vlad Dragos
 Wil Cooley
 William Lee
+Wim Glenn
 Wouter van Ackooy
 Xuan Luong
 Xuecong Liao
diff --git a/changelog/3837.feature.rst b/changelog/3837.feature.rst
new file mode 100644
index 000000000..707c3b0da
--- /dev/null
+++ b/changelog/3837.feature.rst
@@ -0,0 +1 @@
+Added support for 'xfailed' and 'xpassed' outcomes to the ``pytester.RunResult.assert_outcomes`` signature.
diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
index 5b42b81ee..58801be73 100644
--- a/src/_pytest/pytester.py
+++ b/src/_pytest/pytester.py
@@ -406,7 +406,9 @@ class RunResult(object):
                     return d
         raise ValueError("Pytest terminal report not found")
 
-    def assert_outcomes(self, passed=0, skipped=0, failed=0, error=0):
+    def assert_outcomes(
+        self, passed=0, skipped=0, failed=0, error=0, xpassed=0, xfailed=0
+    ):
         """Assert that the specified outcomes appear with the respective
         numbers (0 means it didn't occur) in the text output from a test run.
 
@@ -417,10 +419,18 @@ class RunResult(object):
             "skipped": d.get("skipped", 0),
             "failed": d.get("failed", 0),
             "error": d.get("error", 0),
+            "xpassed": d.get("xpassed", 0),
+            "xfailed": d.get("xfailed", 0),
         }
-        assert obtained == dict(
-            passed=passed, skipped=skipped, failed=failed, error=error
-        )
+        expected = {
+            "passed": passed,
+            "skipped": skipped,
+            "failed": failed,
+            "error": error,
+            "xpassed": xpassed,
+            "xfailed": xfailed,
+        }
+        assert obtained == expected
 
 
 class CwdSnapshot(object):
diff --git a/testing/test_pytester.py b/testing/test_pytester.py
index 86dc35796..8d6128262 100644
--- a/testing/test_pytester.py
+++ b/testing/test_pytester.py
@@ -83,6 +83,57 @@ def test_testdir_runs_with_plugin(testdir):
     result.assert_outcomes(passed=1)
 
 
+def test_runresult_assertion_on_xfail(testdir):
+    testdir.makepyfile(
+        """
+        import pytest
+
+        pytest_plugins = "pytester"
+
+        @pytest.mark.xfail
+        def test_potato():
+            assert False
+    """
+    )
+    result = testdir.runpytest()
+    result.assert_outcomes(xfailed=1)
+    assert result.ret == 0
+
+
+def test_runresult_assertion_on_xpassed(testdir):
+    testdir.makepyfile(
+        """
+        import pytest
+
+        pytest_plugins = "pytester"
+
+        @pytest.mark.xfail
+        def test_potato():
+            assert True
+    """
+    )
+    result = testdir.runpytest()
+    result.assert_outcomes(xpassed=1)
+    assert result.ret == 0
+
+
+def test_xpassed_with_strict_is_considered_a_failure(testdir):
+    testdir.makepyfile(
+        """
+        import pytest
+
+        pytest_plugins = "pytester"
+
+        @pytest.mark.xfail(strict=True)
+        def test_potato():
+            assert True
+    """
+    )
+    result = testdir.runpytest()
+    result.assert_outcomes(failed=1)
+    assert result.ret != 0
+
+
 def make_holder():
     class apiclass(object):
         def pytest_xyz(self, arg):