Merge pull request #4929 from blueyed/fix-_factorytraceback-offset

Fix line offsets with `ScopeMismatch` errors

Author: blueyed

changelog/4928.bugfix.rst

@@ -0,0 +1 @@
+Fix line offsets with ``ScopeMismatch`` errors.

src/_pytest/fixtures.py

@@ -612,7 +612,7 @@ def _factorytraceback(self):
             fs, lineno = getfslineno(factory)
             p = self._pyfuncitem.session.fspath.bestrelpath(fs)
             args = _format_args(factory)
-            lines.append("%s:%d:  def %s%s" % (p, lineno, factory.__name__, args))
+            lines.append("%s:%d:  def %s%s" % (p, lineno + 1, factory.__name__, args))
         return lines
 
     def _getscopeitem(self, scope):

testing/python/fixture.py

@@ -992,8 +992,8 @@ def test_add(arg2):
         result.stdout.fnmatch_lines(
             [
                 "*ScopeMismatch*involved factories*",
-                "* def arg2*",
-                "* def arg1*",
+                "test_receives_funcargs_scope_mismatch.py:6:  def arg2(arg1)",
+                "test_receives_funcargs_scope_mismatch.py:2:  def arg1()",
                 "*1 error*",
             ]
         )