[Pytest-commit] [pytest-dev/pytest] e04182: Move handling of duplicate files

[Bruno Oliveira]

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: e04182364338ed9cd2a63945204701c99e297f21
      https://github.com/pytest-dev/pytest/commit/e04182364338ed9cd2a63945204701c99e297f21
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-25 (Thu, 25 Oct 2018)

  Changed paths:
    M src/_pytest/main.py
    M src/_pytest/python.py
    M testing/test_session.py

  Log Message:
  -----------
  Move handling of duplicate files

This removes the hack added in https://github.com/pytest-dev/pytest/pull/3802.

Adjusts test:

- it appears to not have been changed to 7 intentionally.
- removes XXX comment, likely not relevant anymore since 6dac7743.


  Commit: 8d0e1a99e49ac0fbe08721c7abbbbb379f6cae59
      https://github.com/pytest-dev/pytest/commit/8d0e1a99e49ac0fbe08721c7abbbbb379f6cae59
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-26 (Fri, 26 Oct 2018)

  Changed paths:
    M src/_pytest/main.py
    M src/_pytest/python.py
    M testing/test_session.py

  Log Message:
  -----------
  Merge pull request #4241 from blueyed/move-duplicates

Move handling of duplicate files


Compare: https://github.com/pytest-dev/pytest/compare/bf1991753713...8d0e1a99e49a
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.