[Pytest-commit] [pytest-dev/pytest] b6166d: Fix mock patchings detection when both mock and un...

Thu, 15 Feb 2018 13:36:06 -0800 

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b6166dccb4d2b48173aa7e7739be52db9d2d56a0
      
https://github.com/pytest-dev/pytest/commit/b6166dccb4d2b48173aa7e7739be52db9d2d56a0
  Author: Marcin Bachry <hegel...@gmail.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M _pytest/compat.py
    A changelog/3206.bugfix.rst
    M testing/python/integration.py

  Log Message:
  -----------
  Fix mock patchings detection when both mock and unittest.mock are present


  Commit: 371eb8c6af8d3ae4260865b86d2914c206b9e571
      
https://github.com/pytest-dev/pytest/commit/371eb8c6af8d3ae4260865b86d2914c206b9e571
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-02-15 (Thu, 15 Feb 2018)

  Changed paths:
    M _pytest/compat.py
    A changelog/3206.bugfix.rst
    M testing/python/integration.py

  Log Message:
  -----------
  Merge pull request #3206 from mbachry/fix-unittest-mock

Fix mock patchings detection when both mock and unittest.mock are present


Compare: 
https://github.com/pytest-dev/pytest/compare/e7bcc854d975...371eb8c6af8d
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit

Reply via email to