Skip to content

tests: move test_getfslineno#6610

Merged
blueyed merged 2 commits intopytest-dev:masterfrom
blueyed:tests-move-test_getfslineno
Jan 29, 2020
Merged

tests: move test_getfslineno#6610
blueyed merged 2 commits intopytest-dev:masterfrom
blueyed:tests-move-test_getfslineno

Conversation

@blueyed
Copy link
Contributor

@blueyed blueyed commented Jan 29, 2020

It should be in test_code when testing _pytest._code.getfslineno,
not to be confused with _pytest._code.source.getfslineno.

Adds an extra assert (via #6590).

It should be in `test_code` when testing `_pytest._code.getfslineno`,
not to be confused with `_pytest._code.source.getfslineno`.

Adds an extra assert (via pytest-dev#6590).
@blueyed blueyed force-pushed the tests-move-test_getfslineno branch from fea51f5 to a3f482c Compare January 29, 2020 00:26
Copy link
Member

@bluetech bluetech left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense!

@blueyed blueyed merged commit b429384 into pytest-dev:master Jan 29, 2020
@blueyed blueyed deleted the tests-move-test_getfslineno branch January 29, 2020 18:43
blueyed added a commit to blueyed/pytest that referenced this pull request Jan 29, 2020
Reverts pytest-dev#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.
@blueyed
Copy link
Contributor Author

blueyed commented Jan 29, 2020

Got it wrong.. followup: #6623

blueyed added a commit to blueyed/pytest that referenced this pull request Jan 29, 2020
Reverts pytest-dev#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.
blueyed added a commit to blueyed/pytest that referenced this pull request Jan 29, 2020
Reverts pytest-dev#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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants