Prepare CHANGELOG for 1.18.2

Fix internal handling in process_from_remote

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,8 +4,8 @@ Here's a quick checklist that should be present in PRs:
 
 - [ ] Make sure to include reasonable tests for your change if necessary
 
-- [ ] Add a *news* file into the `changelog` folder, following these guidelines:
+- [ ] We use [towncrier](https://pypi.python.org/pypi/towncrier) for changelog management, so please add a *news* file into the `changelog` folder following these guidelines:
-  * Name it `$issue_id.$type` for example `588.bug`
+  * Name it `$issue_id.$type` for example `588.bugfix`;
   * If you don't have an issue_id change it to the PR id after creating it
   * Ensure type is one of `removal`, `feature`, `bugfix`, `vendor`, `doc` or `trivial`
   * Make sure to use full sentences with correct case and punctuation, for example:

CHANGELOG.rst

@@ -1,3 +1,18 @@
+pytest-xdist 1.18.2 (2017-07-28)
+================================
+
+Bug Fixes
+---------
+
+- Removal of unnecessary dependency on incorrect version of py. (`#105
+  <https://github.com/pytest-dev/pytest-xdist/issues/105>`_)
+
+- Fix bug in internal event-loop error handler in the master node. This bug
+  would shadow the original errors making extremely hard/impossible for users
+  to diagnose the problem properly. (`#175 <https://github.com/pytest-
+  dev/pytest-xdist/issues/175>`_)
+
+
 pytest-xdist 1.18.1 (2017-07-05)
 ================================
 

README.rst

@@ -44,10 +44,6 @@ Installation
 
 Install the plugin with::
 
-    easy_install pytest-xdist
-
-    # or
-
     pip install pytest-xdist
 
 or use the package in develop/in-place mode with
@@ -262,9 +258,3 @@ where the configuration file was found.
 .. _`pytest-xdist`: http://pypi.python.org/pypi/pytest-xdist
 .. _`pytest-xdist repository`: https://github.com/pytest-dev/pytest-xdist
 .. _`pytest`: http://pytest.org
-
-Issue and Bug Tracker
-------------------------
-
-Please use the `pytest issue tracker <https://github.com/pytest-dev/pytest/issues>`_
-for reporting bugs in this plugin.

setup.py

@@ -20,7 +20,7 @@ setup(
         ],
     },
     zip_safe=False,
-    install_requires=['execnet>=1.1', 'pytest>=3.0.0', 'py>=1.4.22'],
+    install_requires=['execnet>=1.1', 'pytest>=3.0.0'],
     setup_requires=['setuptools_scm'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',

testing/test_remote.py

@@ -29,9 +29,9 @@ class EventCall:
 class SlaveSetup:
     use_callback = False
 
-    def __init__(self, request):
+    def __init__(self, request, testdir):
-        self.testdir = request.getfuncargvalue("testdir")
         self.request = request
+        self.testdir = testdir
         self.events = queue.Queue()
 
     def setup(self, ):
@@ -65,8 +65,8 @@ class SlaveSetup:
 
 
 @pytest.fixture
-def slave(request):
+def slave(request, testdir):
-    return SlaveSetup(request)
+    return SlaveSetup(request, testdir)
 
 
 @pytest.mark.xfail(reason='#59')
@@ -319,6 +319,15 @@ class TestSlaveInteractor:
             ("pytest_collectreport", "report.collector.fspath == bbb"),
         ])
 
+    def test_process_from_remote_error_handling(self, slave, capsys):
+        slave.use_callback = True
+        slave.setup()
+        slave.slp.process_from_remote(('<nonono>', ()))
+        out, err = capsys.readouterr()
+        assert 'INTERNALERROR> ValueError: unknown event: <nonono>' in out
+        ev = slave.popevent()
+        assert ev.name == "errordown"
+
 
 def test_remote_env_vars(testdir):
     testdir.makepyfile('''

xdist/slavemanage.py

@@ -323,7 +323,9 @@ class SlaveController(object):
         except:
             excinfo = py.code.ExceptionInfo()
             py.builtin.print_("!" * 20, excinfo)
-            self.config.pluginmanager.notify_exception(excinfo)
+            self.config.notify_exception(excinfo)
+            self.shutdown()
+            self.notify_inproc("errordown", node=self, error=excinfo)
 
 
 def unserialize_report(name, reportdict):