Merge remote-tracking branch 'upstream/master' into joaoe/add-stacktraces-101

Author: nicoddemus

testing/test_gateway.py

@@ -17,6 +17,7 @@
 needs_osdup = py.test.mark.skipif("not hasattr(os, 'dup')")
 
 
+flakytest = pytest.mark.xfail(reason='on some systems this test fails due to timing problems')
 skip_win_pypy = pytest.mark.xfail(condition=hasattr(sys, 'pypy_version_info') and sys.platform.startswith('win'),
                                   reason='failing on Windows on PyPy (#63)')
 
@@ -78,6 +79,7 @@ def test_gateway_status_no_real_channel(self, gw):
         # closure of temporary channels
         assert numchan2 == numchan
 
+    @flakytest
     def test_gateway_status_busy(self, gw):
         numchannels = gw.remote_status().numchannels
         ch1 = gw.remote_exec("channel.send(1); channel.receive()")
@@ -381,6 +383,7 @@ def test_threads_race_sending(self, makegateway):
         for ch in channels:
             ch.waitclose(TESTTIMEOUT)
 
+    @flakytest
     def test_status_with_threads(self, makegateway):
         gw = makegateway('popen')
         c1 = gw.remote_exec("channel.send(1) ; channel.receive()")
@@ -425,6 +428,7 @@ def test_popen_filetracing(self, testdir, monkeypatch, makegateway):
         gw.exit()
 
     @skip_win_pypy
+    @flakytest
     def test_popen_stderr_tracing(self, capfd, monkeypatch, makegateway):
         monkeypatch.setenv('EXECNET_DEBUG', "2")
         gw = makegateway("popen")

testing/test_xspec.py

@@ -125,6 +125,7 @@ def test_popen_default(self, makegateway):
         assert rinfo.version_info == sys.version_info
 
     @pytest.mark.skipif("not hasattr(os, 'nice')")
+    @pytest.mark.xfail(reason='fails due to timing problems on busy single-core VMs')
     def test_popen_nice(self, makegateway):
         gw = makegateway("popen")