Fix off-by-one error with lines from request.node.warn

blueyed · blueyed · commit 16cb5d01b133 · 2016-08-14T22:10:01.000+02:00
The line numbers in `node.location` seem to be zero-based?!
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -72,7 +72,8 @@
 
 *
 
-*
+* Fixed off-by-one error with lines from ``request.node.warn``.
+  Thanks to `@blueyed`_ for the PR.
 
 *
 
diff --git a/_pytest/main.py b/_pytest/main.py
@@ -267,7 +267,7 @@ def warn(self, code, message):
         if fslocation is None:
             fslocation = getattr(self, "fspath", None)
         else:
-            fslocation = "%s:%s" % fslocation[:2]
+            fslocation = "%s:%s" % (fslocation[0], fslocation[1] + 1)
 
         self.ihook.pytest_logwarning.call_historic(kwargs=dict(
             code=code, message=message,
diff --git a/testing/test_config.py b/testing/test_config.py
@@ -525,13 +525,14 @@ def test_proper(pytestconfig):
         reprec = testdir.inline_run()
         reprec.assertoutcome(passed=1)
 
-    def test_warn_on_test_item_from_request(self, testdir):
+    def test_warn_on_test_item_from_request(self, testdir, request):
         testdir.makepyfile("""
             import pytest
 
             @pytest.fixture
             def fix(request):
                 request.node.warn("T1", "hello")
+
             def test_hello(fix):
                 pass
         """)
@@ -542,7 +543,7 @@ def test_hello(fix):
         result = testdir.runpytest("-rw")
         result.stdout.fnmatch_lines("""
             ===*pytest-warning summary*===
-            *WT1*test_warn_on_test_item*:5*hello*
+            *WT1*test_warn_on_test_item*:7 hello*
         """)
 
 class TestRootdir:

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@`
`72`	`72`
`73`	`73`	`*`
`74`	`74`
`75`		`-*`
	`75`	+* Fixed off-by-one error with lines from ``request.node.warn``.
	`76`	+ Thanks to `@blueyed`_ for the PR.
`76`	`77`
`77`	`78`	`*`
`78`	`79`