Merge pull request #2548 from blueyed/skip-fix-lineno

Fix lineno offset in show_skipped
pytest-dev · Jul 25, 2017 · 595ecd2 · 595ecd2
2 parents 71947cb + 869eed9
commit 595ecd2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/_pytest/skipping.py b/_pytest/skipping.py
@@ -382,4 +382,4 @@ def show_skipped(terminalreporter, lines):
                     reason = reason[9:]
                 lines.append(
                     "SKIP [%d] %s:%d: %s" %
-                    (num, fspath, lineno, reason))
+                    (num, fspath, lineno + 1, reason))
diff --git a/changelog/2548.bugfix b/changelog/2548.bugfix
@@ -0,0 +1 @@
+Fix lineno offset in show_skipped.
diff --git a/testing/test_skipping.py b/testing/test_skipping.py
@@ -708,7 +708,7 @@ def doskip():
     )
     result = testdir.runpytest('-rs')
     result.stdout.fnmatch_lines([
-        "*SKIP*2*conftest.py:3: test",
+        "*SKIP*2*conftest.py:4: test",
     ])
     assert result.ret == 0