Merge pull request #90 from nicoddemus/pytest4-compat

pytest 4.1 compatibility fixes

Author: nicoddemus

testing/conftest.py

@@ -39,10 +39,6 @@ def pytest_addoption(parser):
     group.addoption(
         '--gx', action="append", dest="gspecs", default=None,
         help="add a global test environment, XSpec-syntax. ")
-    group.addoption(
-        '--gwscope', action="store", dest="scope", default="session",
-        type="choice", choices=["session", "function"],
-        help="set gateway setup scope, default: session.")
     group.addoption(
         '--pypy', action="store_true", dest="pypy",
         help="run some tests also against pypy")
@@ -52,13 +48,6 @@ def pytest_addoption(parser):
               "page on invalid addresses"))
 
 
-def pytest_report_header(config):
-    return [
-        "gateway test setup scope: %s" % config.getvalue("scope"),
-        "execnet: {} -- {}".format(execnet.__file__, execnet.__version__),
-    ]
-
-
 @pytest.fixture
 def specssh(request):
     return getspecssh(request.config)
@@ -144,22 +133,22 @@ def anypython(request):
                 executable = None
         py.test.skip("no {} found".format(name))
     if "execmodel" in request.fixturenames and name != 'sys.executable':
-        backend = request.getfuncargvalue("execmodel").backend
+        backend = request.getfixturevalue("execmodel").backend
         if backend != "thread":
             pytest.xfail(
                 "cannot run {!r} execmodel with bare {}".format(backend, name))
     return executable
 
 
+@pytest.fixture(scope='session')
+def group():
+    g = execnet.Group()
+    yield g
+    g.terminate(timeout=1)
+
+
 @pytest.fixture
-def gw(request, execmodel):
-    scope = request.config.option.scope
-    group = request.cached_setup(
-        setup=execnet.Group,
-        teardown=lambda group: group.terminate(timeout=1),
-        extrakey="testgroup",
-        scope=scope,
-    )
+def gw(request, execmodel, group):
     try:
         return group[request.param]
     except KeyError:
@@ -180,14 +169,16 @@ def gw(request, execmodel):
             gw.proxygw = proxygw
             assert pname in group
         elif request.param == "ssh":
-            sshhost = request.getfuncargvalue('specssh').ssh
+            sshhost = request.getfixturevalue('specssh').ssh
             # we don't use execmodel.backend here
             # but you can set it when specifying the ssh spec
             gw = group.makegateway("ssh={}//id=ssh".format(sshhost))
         elif request.param == 'proxy':
             group.makegateway('popen//id=proxy-transport')
             gw = group.makegateway('popen//via=proxy-transport//id=proxy'
                                    '//execmodel=%s' % execmodel.backend)
+        else:
+            assert 0, "unknown execmodel: {}".format(request.param)
         return gw
 
 

testing/test_basics.py

@@ -385,8 +385,10 @@ def func(channel, data):
 
 def test_remote_exc__no_kwargs(makegateway):
     gw = makegateway()
-    pytest.raises(TypeError, gw.remote_exec, gateway_base, kwarg=1)
-    pytest.raises(TypeError, gw.remote_exec, 'pass', kwarg=1)
+    with pytest.raises(TypeError):
+        gw.remote_exec(gateway_base, kwarg=1)
+    with pytest.raises(TypeError):
+        gw.remote_exec('pass', kwarg=1)
 
 
 @skip_win_pypy

testing/test_channel.py

@@ -37,7 +37,8 @@ def test_waitclose_timeouterror(self, gw):
 
     def test_channel_receive_timeout(self, gw):
         channel = gw.remote_exec('channel.send(channel.receive())')
-        pytest.raises(channel.TimeoutError, "channel.receive(timeout=0.2)")
+        with pytest.raises(channel.TimeoutError):
+            channel.receive(timeout=0.2)
         channel.send(1)
         channel.receive(timeout=TESTTIMEOUT)
 
@@ -263,9 +264,8 @@ def f(item):
         """)
         subchan = channel.receive()
         subchan.send(1)
-        excinfo = pytest.raises(
-            subchan.RemoteError,
-            "subchan.waitclose(TESTTIMEOUT)")
+        with pytest.raises(subchan.RemoteError) as excinfo:
+            subchan.waitclose(TESTTIMEOUT)
         assert "42" in excinfo.value.formatted
         channel.send(1)
         channel.waitclose()
@@ -289,7 +289,8 @@ def test_channel_file_write_error(self, gw):
         f = channel.makefile()
         assert not f.isatty()
         channel.waitclose(TESTTIMEOUT)
-        pytest.raises(IOError, f.write, 'hello')
+        with pytest.raises(IOError):
+            f.write('hello')
 
     def test_channel_file_proxyclose(self, gw):
         channel = gw.remote_exec("""

testing/test_gateway.py

@@ -138,9 +138,8 @@ def test_remote_exec_error_after_close(self, gw):
 
     def test_remote_exec_no_explicit_close(self, gw):
         channel = gw.remote_exec('channel.close()')
-        excinfo = py.test.raises(
-            channel.RemoteError,
-            "channel.waitclose(TESTTIMEOUT)")
+        with pytest.raises(channel.RemoteError) as excinfo:
+            channel.waitclose(TESTTIMEOUT)
         assert "explicit" in excinfo.value.formatted
 
     def test_remote_exec_channel_anonymous(self, gw):
@@ -218,9 +217,8 @@ def test_chdir_separation(self, tmpdir, makegateway):
         assert x.lower() == str(waschangedir).lower()
 
     def test_remoteerror_readable_traceback(self, gw):
-        e = py.test.raises(
-            gateway_base.RemoteError,
-            'gw.remote_exec("x y").waitclose()')
+        with pytest.raises(gateway_base.RemoteError) as e:
+            gw.remote_exec("x y").waitclose()
         assert "gateway_base" in e.value.formatted
 
     def test_many_popen(self, makegateway):
@@ -253,9 +251,12 @@ def test_waitclose_on_remote_killed(self, makegateway):
         """)
         remotepid = channel.receive()
         py.process.kill(remotepid)
-        py.test.raises(EOFError, "channel.waitclose(TESTTIMEOUT)")
-        py.test.raises(IOError, channel.send, None)
-        py.test.raises(EOFError, channel.receive)
+        with pytest.raises(EOFError):
+            channel.waitclose(TESTTIMEOUT)
+        with pytest.raises(IOError):
+            channel.send(None)
+        with pytest.raises(EOFError):
+            channel.receive()
 
     def test_receive_on_remote_sysexit(self, gw):
         channel = gw.remote_exec("""
@@ -371,8 +372,8 @@ def test_status_with_threads(self, makegateway):
 class TestTracing:
     def test_popen_filetracing(self, testdir, monkeypatch, makegateway):
         tmpdir = testdir.tmpdir
-        monkeypatch.setenv("TMP", tmpdir)
-        monkeypatch.setenv("TEMP", tmpdir)  # windows
+        monkeypatch.setenv("TMP", str(tmpdir))
+        monkeypatch.setenv("TEMP", str(tmpdir))  # windows
         monkeypatch.setenv('EXECNET_DEBUG', "1")
         gw = makegateway("popen")
         #  hack out the debuffilename

testing/test_multi.py

@@ -176,14 +176,17 @@ def test_gateway_and_id(self):
         group = Group()
         gw = group.makegateway("popen//id=hello")
         assert group["hello"] == gw
-        py.test.raises((TypeError, AttributeError), "del group['hello']")
-        py.test.raises((TypeError, AttributeError), "group['hello'] = 5")
+        with pytest.raises((TypeError, AttributeError)):
+            del group['hello']
+        with pytest.raises((TypeError, AttributeError)):
+            group['hello'] = 5
         assert 'hello' in group
         assert gw in group
         assert len(group) == 1
         gw.exit()
         assert 'hello' not in group
-        py.test.raises(KeyError, "group['hello']")
+        with pytest.raises(KeyError):
+            _ = group['hello']
 
     def test_default_group(self):
         oldlist = list(execnet.default_group)

testing/test_rsync.py

@@ -90,12 +90,14 @@ def test_dirsync_twice(self, dirs, gw1, gw2):
         rsync.add_target(gw1, dirs.dest1)
         rsync.send()
         assert dirs.dest1.join('hello').check()
-        py.test.raises(IOError, "rsync.send()")
+        with pytest.raises(IOError):
+            rsync.send()
         assert rsync.send(raises=False) is None
         rsync.add_target(gw1, dirs.dest2)
         rsync.send()
         assert dirs.dest2.join('hello').check()
-        py.test.raises(IOError, "rsync.send()")
+        with pytest.raises(IOError):
+            rsync.send()
         assert rsync.send(raises=False) is None
 
     def test_rsync_default_reporting(self, capsys, dirs, gw1):

testing/test_serializer.py

@@ -116,12 +116,12 @@ def py3(request):
 
 @pytest.fixture(params=['py2', 'py3'])
 def dump(request):
-    return request.getfuncargvalue(request.param).dump
+    return request.getfixturevalue(request.param).dump
 
 
 @pytest.fixture(params=['py2', 'py3'])
 def load(request):
-    return request.getfuncargvalue(request.param).load
+    return request.getfixturevalue(request.param).load
 
 
 simple_tests = [

testing/test_xspec.py

@@ -23,7 +23,8 @@ def test_norm_attributes(self):
         assert spec.nice is None
         assert not hasattr(spec, '_xyz')
 
-        pytest.raises(AttributeError, "spec._hello")
+        with pytest.raises(AttributeError):
+            spec._hello()
 
         spec = XSpec("socket=192.168.102.2:8888//python=python2.5//nice=3")
         assert spec.socket == "192.168.102.2:8888"