Merge pull request #132 from pytest-dev/conftest-upgrade

bring the tests up2date with modern patterns

Author: RonnyPfannschmidt

conftest.py

@@ -1,36 +1,25 @@
 import py
+import pytest
 import sys
 
-pytest_plugins = 'doctest pytester'.split()
+pytest_plugins = 'doctest', 'pytester'
 
 collect_ignore = ['build', 'doc/_build']
 
 
-import os, py
-pid = os.getpid()
-
 def pytest_addoption(parser):
     group = parser.getgroup("pylib", "py lib testing options")
     group.addoption('--runslowtests',
            action="store_true", dest="runslowtests", default=False,
            help=("run slow tests"))
 
-def pytest_funcarg__sshhost(request):
+@pytest.fixture
+def sshhost(request):
     val = request.config.getvalue("sshhost")
     if val:
         return val
     py.test.skip("need --sshhost option")
-def pytest_generate_tests(metafunc):
-    multi = getattr(metafunc.function, 'multi', None)
-    if multi is not None:
-        assert len(multi.kwargs) == 1
-        for name, l in multi.kwargs.items():
-            for val in l:
-                metafunc.addcall(funcargs={name: val})
-    elif 'anypython' in metafunc.funcargnames:
-        for name in ('python2.4', 'python2.5', 'python2.6',
-                     'python2.7', 'python3.1', 'pypy-c', 'jython'):
-            metafunc.addcall(id=name, param=name)
+
 
 # XXX copied from execnet's conftest.py - needs to be merged
 winpymap = {
@@ -41,6 +30,7 @@ def pytest_generate_tests(metafunc):
     'python3.1': r'C:\Python31\python.exe',
 }
 
+
 def getexecutable(name, cache={}):
     try:
         return cache[name]
@@ -49,15 +39,19 @@ def getexecutable(name, cache={}):
         if executable:
             if name == "jython":
                 import subprocess
-                popen = subprocess.Popen([str(executable), "--version"],
+                popen = subprocess.Popen(
+                    [str(executable), "--version"],
                     universal_newlines=True, stderr=subprocess.PIPE)
                 out, err = popen.communicate()
                 if not err or "2.5" not in err:
                     executable = None
         cache[name] = executable
         return executable
 
-def pytest_funcarg__anypython(request):
+
+@pytest.fixture(params=('python2.4', 'python2.5', 'python2.6',
+                        'python2.7', 'python3.1', 'pypy-c', 'jython'))
+def anypython(request):
     name = request.param
     executable = getexecutable(name)
     if executable is None:

testing/code/test_excinfo.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 
 import py
+import pytest
+from test_source import astonly
+
 from py._code.code import FormattedExcinfo, ReprExceptionInfo
 queue = py.builtin._tryimport('queue', 'Queue')
 
 failsonjython = py.test.mark.xfail("sys.platform.startswith('java')")
-from test_source import astonly
 
 try:
     import importlib
@@ -14,40 +16,49 @@
 else:
     invalidate_import_caches = getattr(importlib, "invalidate_caches", None)
 
-import pytest
+
 pytest_version_info = tuple(map(int, pytest.__version__.split(".")[:3]))
 
+
 class TWMock:
     def __init__(self):
         self.lines = []
+
     def sep(self, sep, line=None):
         self.lines.append((sep, line))
+
     def line(self, line, **kw):
         self.lines.append(line)
+
     def markup(self, text, **kw):
         return text
 
     fullwidth = 80
 
+
 def test_excinfo_simple():
     try:
         raise ValueError
     except ValueError:
         info = py.code.ExceptionInfo()
     assert info.type == ValueError
 
+
 def test_excinfo_getstatement():
     def g():
         raise ValueError
+
     def f():
         g()
     try:
         f()
     except ValueError:
         excinfo = py.code.ExceptionInfo()
-    linenumbers = [py.code.getrawcode(f).co_firstlineno-1+3,
-                   py.code.getrawcode(f).co_firstlineno-1+1,
-                   py.code.getrawcode(g).co_firstlineno-1+1,]
+    linenumbers = [
+        py.code.getrawcode(f).co_firstlineno-1+3,
+        py.code.getrawcode(f).co_firstlineno-1+1,
+        py.code.getrawcode(g).co_firstlineno-1+1,
+    ]
     l = list(excinfo.traceback)
     foundlinenumbers = [x.lineno for x in l]
     assert foundlinenumbers == linenumbers
@@ -92,7 +103,7 @@ def test_traceback_entries(self):
 
     def test_traceback_entry_getsource(self):
         tb = self.excinfo.traceback
-        s = str(tb[-1].getsource() )
+        s = str(tb[-1].getsource())
         assert s.startswith("def f():")
         assert s.endswith("raise ValueError")
 
@@ -164,10 +175,12 @@ def f(n):
     def test_traceback_no_recursion_index(self):
         def do_stuff():
             raise RuntimeError
+
         def reraise_me():
             import sys
             exc, val, tb = sys.exc_info()
             py.builtin._reraise(exc, val, tb)
+
         def f(n):
             try:
                 do_stuff()
@@ -179,7 +192,7 @@ def f(n):
         assert recindex is None
 
     def test_traceback_messy_recursion(self):
-        #XXX: simplified locally testable version
+        # XXX: simplified locally testable version
         decorator = py.test.importorskip('decorator').decorator
 
         def log(f, *k, **kw):
@@ -195,17 +208,18 @@ def fail():
         excinfo = py.test.raises(ValueError, fail)
         assert excinfo.traceback.recursionindex() is None
 
-
-
     def test_traceback_getcrashentry(self):
         def i():
             __tracebackhide__ = True
             raise ValueError
+
         def h():
             i()
+
         def g():
             __tracebackhide__ = True
             h()
+
         def f():
             g()
 
@@ -221,6 +235,7 @@ def test_traceback_getcrashentry_empty(self):
         def g():
             __tracebackhide__ = True
             raise ValueError
+
         def f():
             __tracebackhide__ = True
             g()
@@ -233,9 +248,11 @@ def f():
         assert entry.lineno == co.firstlineno + 2
         assert entry.frame.code.name == 'g'
 
+
 def hello(x):
     x + 5
 
+
 def test_tbentry_reinterpret():
     try:
         hello("hello")
@@ -245,6 +262,7 @@ def test_tbentry_reinterpret():
     msg = tbentry.reinterpret()
     assert msg.startswith("TypeError: ('hello' + 5)")
 
+
 def test_excinfo_exconly():
     excinfo = py.test.raises(ValueError, h)
     assert excinfo.exconly().startswith('ValueError')
@@ -254,22 +272,26 @@ def test_excinfo_exconly():
     assert msg.startswith('ValueError')
     assert msg.endswith("world")
 
+
 def test_excinfo_repr():
     excinfo = py.test.raises(ValueError, h)
     s = repr(excinfo)
     assert s == "<ExceptionInfo ValueError tblen=4>"
 
+
 def test_excinfo_str():
     excinfo = py.test.raises(ValueError, h)
     s = str(excinfo)
     assert s.startswith(__file__[:-9]) # pyc file and $py.class
     assert s.endswith("ValueError")
     assert len(s.split(":")) >= 3 # on windows it's 4
 
+
 def test_excinfo_errisinstance():
     excinfo = py.test.raises(ValueError, h)
     assert excinfo.errisinstance(ValueError)
 
+
 def test_excinfo_no_sourcecode():
     try:
         exec ("raise ValueError()")
@@ -281,6 +303,7 @@ def test_excinfo_no_sourcecode():
     else:
         assert s == "  File '<string>':1 in <module>\n  ???\n"
 
+
 def test_excinfo_no_python_sourcecode(tmpdir):
     #XXX: simplified locally testable version
     tmpdir.join('test.txt').write("{{ h()}}:")
@@ -292,7 +315,7 @@ def test_excinfo_no_python_sourcecode(tmpdir):
     excinfo = py.test.raises(ValueError,
                              template.render, h=h)
     for item in excinfo.traceback:
-        print(item) #XXX: for some reason jinja.Template.render is printed in full
+        print(item) # XXX: for some reason jinja.Template.render is printed in full
         item.source # shouldnt fail
         if item.path.basename == 'test.txt':
             assert str(item.source) == '{{ h()}}:'
@@ -309,6 +332,7 @@ def test_entrysource_Queue_example():
     s = str(source).strip()
     assert s.startswith("def get")
 
+
 def test_codepath_Queue_example():
     try:
         queue.Queue().get(timeout=0.001)
@@ -320,6 +344,7 @@ def test_codepath_Queue_example():
     assert path.basename.lower() == "queue.py"
     assert path.check()
 
+
 class TestFormattedExcinfo:
     def pytest_funcarg__importasmod(self, request):
         def importasmod(source):
@@ -372,7 +397,6 @@ def f():
             'E       assert 0'
         ]
 
-
     def test_repr_source_not_existing(self):
         pr = FormattedExcinfo()
         co = compile("raise ValueError()", "", "exec")
@@ -842,14 +866,16 @@ def f():
         finally:
             old.chdir()
 
-    @py.test.mark.multi(reproptions=[
-        {'style': style, 'showlocals': showlocals,
-         'funcargs': funcargs, 'tbfilter': tbfilter
-        } for style in ("long", "short", "no")
-            for showlocals in (True, False)
-                for tbfilter in (True, False)
-                    for funcargs in (True, False)])
-    def test_format_excinfo(self, importasmod, reproptions):
+    @pytest.mark.parametrize('style', ("long", "short", "no"))
+    @pytest.mark.parametrize('showlocals', (True, False),
+                             ids=['locals', 'nolocals'])
+    @pytest.mark.parametrize('tbfilter', (True, False),
+                             ids=['tbfilter', 'nofilter'])
+    @pytest.mark.parametrize('funcargs', (True, False),
+                             ids=['funcargs', 'nofuncargs'])
+    def test_format_excinfo(self, importasmod,
+                            style, showlocals, tbfilter, funcargs):
+        
         mod = importasmod("""
             def g(x):
                 raise ValueError(x)
@@ -858,11 +884,15 @@ def f():
         """)
         excinfo = py.test.raises(ValueError, mod.f)
         tw = py.io.TerminalWriter(stringio=True)
-        repr = excinfo.getrepr(**reproptions)
+        repr = excinfo.getrepr(
+            style=style,
+            showlocals=showlocals,
+            funcargs=funcargs,
+            tbfilter=tbfilter
+        )
         repr.toterminal(tw)
         assert tw.stringio.getvalue()
 
-
     def test_native_style(self):
         excinfo = self.excinfo_from_exec("""
             assert 0

testing/io_/test_capture.py

@@ -460,7 +460,7 @@ def func(x, y):
     assert err.startswith("4")
 
 @needsdup
-@py.test.mark.multi(use=[True, False])
+@py.test.mark.parametrize('use', [True, False])
 def test_fdcapture_tmpfile_remains_the_same(tmpfile, use):
     if not use:
         tmpfile = True
@@ -472,7 +472,7 @@ def test_fdcapture_tmpfile_remains_the_same(tmpfile, use):
     capfile2 = cap.err.tmpfile
     assert capfile2 == capfile
 
-@py.test.mark.multi(method=['StdCapture', 'StdCaptureFD'])
+@py.test.mark.parametrize('method', ['StdCapture', 'StdCaptureFD'])
 def test_capturing_and_logging_fundamentals(testdir, method):
     if method == "StdCaptureFD" and not hasattr(os, 'dup'):
         py.test.skip("need os.dup")

testing/path/test_local.py

@@ -179,7 +179,7 @@ def test_write_and_ensure(self, path1):
         p.write("hello", ensure=1)
         assert p.read() == "hello"
 
-    @py.test.mark.multi(bin=(False, True))
+    @py.test.mark.parametrize('bin', (False, True))
     def test_dump(self, tmpdir, bin):
         path = tmpdir.join("dumpfile%s" % int(bin))
         try: