From 3330aac8776a0148122c79f1835d1d585686ef60 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 11 Jul 2015 11:45:27 -0300
Subject: [PATCH] Add test for new pytest-2.8 behavior and add CHANGELOG entry

---
 CHANGELOG                  |  2 ++
 testing/acceptance_test.py | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index a340dfa..efe5c73 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 1.13.dev1
 -------------------------
 
+- conforming with new pytest-2.8 behavior of returning non-zero when all
+  tests were skipped or deselected.
 - release as wheel
 
 1.12
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index 134d63c..eb1758a 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -397,6 +397,31 @@ def test_session_hooks(testdir):
     assert testdir.tmpdir.join("slave").check()
     assert testdir.tmpdir.join("master").check()
 
+
+def test_session_testscollected(testdir):
+    """
+    Make sure master node is updating the session object with the number
+    of tests collected from the slaves.
+    """
+    testdir.makepyfile(test_foo="""
+        import pytest
+        @pytest.mark.parametrize('i', range(3))
+        def test_ok(i):
+            pass
+    """)
+    testdir.makeconftest("""
+        def pytest_sessionfinish(session):
+            collected = getattr(session, 'testscollected', None)
+            with open('testscollected', 'w') as f:
+                f.write('collected = %s' % collected)
+    """)
+    result = testdir.inline_run("-n1")
+    result.assertoutcome(passed=3)
+    collected_file = testdir.tmpdir.join('testscollected')
+    assert collected_file.isfile()
+    assert collected_file.read() == 'collected = 3'
+
+
 def test_funcarg_teardown_failure(testdir):
     p = testdir.makepyfile("""
         def pytest_funcarg__myarg(request):