diff options
author | Daniel Hahler <git@thequod.de> | 2020-01-29 22:43:22 +0100 |
---|---|---|
committer | Daniel Hahler <git@thequod.de> | 2020-01-29 23:47:39 +0100 |
commit | 78eddcb5b10d652d757c9a80cba642d89aa56f11 (patch) | |
tree | 2e6dc647096415148e30b26970d65294e7083025 /testing | |
parent | 66330444a3c49baabcfbf9e699a480aa9bccf090 (diff) | |
download | pytest-78eddcb5b10d652d757c9a80cba642d89aa56f11.tar.gz |
tests: move test_getfslineno back
Reverts https://github.com/pytest-dev/pytest/pull/6610.
The tested `getfslineno` is `src/_pytest/_code/source.py` actually,
exported via `src/_pytest/_code/__init__.py`.
I've confused it with the one in `src/_pytest/compat.py` apparently.
Diffstat (limited to 'testing')
-rw-r--r-- | testing/code/test_code.py | 33 | ||||
-rw-r--r-- | testing/code/test_source.py | 32 |
2 files changed, 31 insertions, 34 deletions
diff --git a/testing/code/test_code.py b/testing/code/test_code.py index 5d35c19ab..826a37708 100644 --- a/testing/code/test_code.py +++ b/testing/code/test_code.py @@ -1,15 +1,11 @@ -import inspect import sys from types import FrameType from unittest import mock -import py.path - import pytest from _pytest._code import Code from _pytest._code import ExceptionInfo from _pytest._code import Frame -from _pytest._code import getfslineno from _pytest._code.code import ReprFuncArgs @@ -184,32 +180,3 @@ class TestReprFuncArgs: tw_mock.lines[0] == r"unicode_string = São Paulo, utf8_string = b'S\xc3\xa3o Paulo'" ) - - -def test_getfslineno() -> None: - def f(x) -> None: - raise NotImplementedError() - - fspath, lineno = getfslineno(f) - - assert isinstance(fspath, py.path.local) - assert fspath.basename == "test_code.py" - assert lineno == f.__code__.co_firstlineno - 1 # see findsource - - class A: - pass - - fspath, lineno = getfslineno(A) - - _, A_lineno = inspect.findsource(A) - assert isinstance(fspath, py.path.local) - assert fspath.basename == "test_code.py" - assert lineno == A_lineno - - assert getfslineno(3) == ("", -1) - - class B: - pass - - B.__name__ = "B2" - assert getfslineno(B)[1] == -1 diff --git a/testing/code/test_source.py b/testing/code/test_source.py index d769d4d77..b5efdb317 100644 --- a/testing/code/test_source.py +++ b/testing/code/test_source.py @@ -9,10 +9,11 @@ from typing import Any from typing import Dict from typing import Optional -import py +import py.path import _pytest._code import pytest +from _pytest._code import getfslineno from _pytest._code import Source @@ -495,6 +496,35 @@ def test_findsource() -> None: assert src[lineno] == " def x():" +def test_getfslineno() -> None: + def f(x) -> None: + raise NotImplementedError() + + fspath, lineno = getfslineno(f) + + assert isinstance(fspath, py.path.local) + assert fspath.basename == "test_source.py" + assert lineno == f.__code__.co_firstlineno - 1 # see findsource + + class A: + pass + + fspath, lineno = getfslineno(A) + + _, A_lineno = inspect.findsource(A) + assert isinstance(fspath, py.path.local) + assert fspath.basename == "test_source.py" + assert lineno == A_lineno + + assert getfslineno(3) == ("", -1) + + class B: + pass + + B.__name__ = "B2" + assert getfslineno(B)[1] == -1 + + def test_code_of_object_instance_with_call() -> None: class A: pass |