Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some conftest changes #9493

Merged
merged 7 commits into from Jan 12, 2022
Merged

Some conftest changes #9493

merged 7 commits into from Jan 12, 2022

Commits on Jan 8, 2022

  1. Copy the full SHA
    5f23157 View commit details
    Browse the repository at this point in the history
  2. config: some comments

    bluetech committed Jan 8, 2022
    Copy the full SHA
    1c7644c View commit details
    Browse the repository at this point in the history
  3. config: make confcutdir check a bit more clear & correct

    I think this named function makes the code a bit easier to understand.
    
    Also change the check to explicitly check for "is a sub-path of" instead
    of the previous check which only worked assuming that path is within
    confcutdir or a direct parent of it.
    bluetech committed Jan 8, 2022
    Copy the full SHA
    0c98f19 View commit details
    Browse the repository at this point in the history
  4. testing/test_monkeypatch: fix some patches leaking into pytest code

    The tests patch `os.path.abspath` which can break some pytest internal
    code since the patching is not undone immediately.
    bluetech committed Jan 8, 2022
    Copy the full SHA
    ed83efa View commit details
    Browse the repository at this point in the history
  5. config: return Sequence instead of List from _getconftestmodules

    Nothing should mutate the internal data structure here.
    bluetech committed Jan 8, 2022
    Copy the full SHA
    d98b695 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2022

  1. config: stop resolving symlinks in conftest paths

    This became the wrong thing to do since
    322190f.
    bluetech committed Jan 9, 2022
    Copy the full SHA
    0ef8823 View commit details
    Browse the repository at this point in the history
  2. config: get rid of _conftestpath2mod

    It duplicates what PluginManager already knows, and no longer needed now
    that symlinks are not resolved (see previous commit).
    bluetech committed Jan 9, 2022
    Copy the full SHA
    161bc48 View commit details
    Browse the repository at this point in the history