From 3fd8257c170591078ff1a8eb489ccf82de7dd8f0 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com>
Date: Wed, 20 Jul 2016 17:20:10 +0200
Subject: [PATCH] add test for --maxfail=NUM overiding -x

---
 testing/test_session.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/testing/test_session.py b/testing/test_session.py
index e3b9f0fcc..a7dcb27a4 100644
--- a/testing/test_session.py
+++ b/testing/test_session.py
@@ -197,6 +197,14 @@ class TestNewSession(SessionTests):
         colfail = [x for x in finished if x.failed]
         assert len(colfail) == 1
 
+    def test_minus_x_overriden_by_maxfail(self, testdir):
+        testdir.makepyfile(__init__="")
+        testdir.makepyfile(test_one="xxxx", test_two="yyyy", test_third="zzz")
+        reprec = testdir.inline_run("-x", "--maxfail=2", testdir.tmpdir)
+        finished = reprec.getreports("pytest_collectreport")
+        colfail = [x for x in finished if x.failed]
+        assert len(colfail) == 2
+
 
 def test_plugin_specify(testdir):
     pytest.raises(ImportError, """