Fix test discovery crash in pytest adapter on doctest (lineno is None) (#8920)

ogrisel · Kartik Raj · commit 572205d4ebc2 · 2019-12-13T11:31:13.000-08:00
* FIX better handle unknown lineno in pytest discovery

* Add changelog entry

* Trigger CI to check potentially unrelated Heisen-failure
diff --git a/news/2 Fixes/7487.md b/news/2 Fixes/7487.md
@@ -0,0 +1,2 @@
+Fix a crash when using pytest to discover doctests with unknown line number.
+(thanks [Olivier Grisel](https://github.com/ogrisel/))
diff --git a/pythonFiles/testing_tools/adapter/pytest/_pytest_item.py b/pythonFiles/testing_tools/adapter/pytest/_pytest_item.py
@@ -274,14 +274,16 @@ def _get_location(item, testroot, relfile, #*,
                     # function to be in relfile.  So here we ignore any
                     # other file and just say "somewhere in relfile".
                     lineno = None
-            if lineno is None:
-                lineno = -1  # i.e. "unknown"
         elif _matches_relfile(srcfile, testroot, relfile):
             srcfile = relfile
         # Otherwise we just return the info from item.location as-is.
 
         if not srcfile.startswith('.' + _pathsep):
             srcfile = '.' + _pathsep + srcfile
+
+    if lineno is None:
+        lineno = -1  # i.e. "unknown"
+
     # from pytest, line numbers are 0-based
     location = '{}:{}'.format(srcfile, int(lineno) + 1)
     return location, fullname

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix a crash when using pytest to discover doctests with unknown line number.`
	`2`	`+(thanks [Olivier Grisel](https://github.com/ogrisel/))`