-
-
Notifications
You must be signed in to change notification settings - Fork 147
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
Implement selective un-spying and un-patching #319
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @sgaist!
Looks good, left two minor comments.
if mock is m: | ||
p.stop() | ||
del self._patches_and_mocks[index] | ||
break |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably it is best to raise an error if the given mock is not registered by us, to avoid mistakes being silent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point
docs/usage.rst
Outdated
@@ -94,6 +95,24 @@ As of version 3.0.0, ``mocker.spy`` also works with ``async def`` functions. | |||
|
|||
.. _#175: https://github.com/pytest-dev/pytest-mock/issues/175 | |||
|
|||
As of version 3.9.1, spying can be also selectively stopped. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given this is a new feature, the next will be a minor release.
As of version 3.9.1, spying can be also selectively stopped. | |
As of version 3.10, spying can be also selectively stopped. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, 3.10 or rather 3.10.0 ?
Based on the patch of @nicoddemus in issue pytest-dev#259 Fixes pytest-dev#259
0098d86
to
3a32bc1
Compare
Thanks @sgaist! |
4696: Update pytest-mock requirement from ~=3.9.0 to ~=3.10.0 r=jenshnielsen a=dependabot[bot] Updates the requirements on [pytest-mock](https://github.com/pytest-dev/pytest-mock) to permit the latest version. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-mock/releases">pytest-mock's releases</a>.</em></p> <blockquote> <h2>v3.10.0</h2> <ul> <li>Added new <code>mocker.stop(m)</code> method to stop specific <code>mocker.patch</code> or <code>mocker.spy</code> calls (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/319">#319</a>).</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-mock/blob/main/CHANGELOG.rst">pytest-mock's changelog</a>.</em></p> <blockquote> <h2>3.10.0 (2022-10-05)</h2> <ul> <li>Added new <code>mocker.stop(m)</code> method to stop specific <code>mocker.patch</code> or <code>mocker.spy</code> calls (<code>[#319](https://github.com/pytest-dev/pytest-mock/issues/319)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/319">#319</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/319">pytest-dev/pytest-mock#319</a></p> <h2>3.9.0 (2022-09-28)</h2> <ul> <li>Expose <code>NonCallableMagicMock</code> via the <code>mocker</code> fixture (<code>[#318](https://github.com/pytest-dev/pytest-mock/issues/318)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/318">#318</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/318">pytest-dev/pytest-mock#318</a></p> <h2>3.8.2 (2022-07-05)</h2> <ul> <li>Fixed <code>AsyncMock</code> support for Python 3.7+ in <code>mocker.async_stub</code> (<code>[#302](https://github.com/pytest-dev/pytest-mock/issues/302)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/302">#302</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/302">pytest-dev/pytest-mock#302</a></p> <h2>3.8.1 (2022-06-24)</h2> <ul> <li>Fixed regression caused by an explicit <code>mock</code> dependency in the code (<code>[#298](https://github.com/pytest-dev/pytest-mock/issues/298)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/298">#298</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/298">pytest-dev/pytest-mock#298</a></p> <h2>3.8.0 (2022-06-24)</h2> <ul> <li>Add <code>MockerFixture.async_mock</code> method. Thanks <code>`@PerchunPak</code>_` for the PR (<code>[#296](https://github.com/pytest-dev/pytest-mock/issues/296)</code>_).</li> </ul> <p>.. _<a href="https://github.com/PerchunPak"><code>`@PerchunPak</code></a>:` <a href="https://github.com/PerchunPak">https://github.com/PerchunPak</a> .. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/296">#296</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/296">pytest-dev/pytest-mock#296</a></p> <h2>3.7.0 (2022-01-28)</h2> <ul> <li>Python 3.10 now officially supported.</li> <li>Dropped support for Python 3.6.</li> </ul> <h2>3.6.1 (2021-05-06)</h2> <ul> <li>Fix <code>mocker.resetall()</code> when using <code>mocker.spy()</code> (<code>[#237](https://github.com/pytest-dev/pytest-mock/issues/237)</code><em>). Thanks <code>`@blaxter</code></em>` for the report and <code>`@shadycuz</code>_` for the PR.</li> </ul> <p>.. _<a href="https://github.com/blaxter"><code>`@blaxter</code></a>:` <a href="https://github.com/blaxter">https://github.com/blaxter</a> .. _<a href="https://github.com/shadycuz"><code>`@shadycuz</code></a>:` <a href="https://github.com/shadycuz">https://github.com/shadycuz</a> .. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/237">#237</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/237">pytest-dev/pytest-mock#237</a></p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/6c03dfd4240de4a178bab67c0a32fba28d8bcf91"><code>6c03dfd</code></a> Release 3.10.0</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/fbb5039d7269c34705a7dab39f2a2cea92111859"><code>fbb5039</code></a> Implement selective un-spying and un-patching (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/319">#319</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/a1c7421daad8d6bc433db28a5df1b01bd0a93222"><code>a1c7421</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/321">#321</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/4f2703c94ce4838befc1ffef1c3bdca4ac1eccf2"><code>4f2703c</code></a> Add Python 3.11 support (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/320">#320</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/1e2001fb78aeb42ae068cc0c17075016d47fa1a7"><code>1e2001f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/318">#318</a> from willfrey/patch-2</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/798f07e99773b05d284be6f4cb32e79d532965b5"><code>798f07e</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/317">#317</a>)</li> <li>See full diff in <a href="https://github.com/pytest-dev/pytest-mock/compare/v3.9.0...v3.10.0">compare view</a></li> </ul> </details> <br /> You can trigger a rebase of this PR by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [pytest-mock](https://github.com/pytest-dev/pytest-mock) from 3.8.2 to 3.10.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-mock/releases">pytest-mock's releases</a>.</em></p> <blockquote> <h2>v3.10.0</h2> <ul> <li>Added new <code>mocker.stop(m)</code> method to stop specific <code>mocker.patch</code> or <code>mocker.spy</code> calls (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/319">#319</a>).</li> </ul> <h2>v3.9.0</h2> <ul> <li>Expose <code>NonCallableMagicMock</code> via the <code>mocker</code> fixture (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/318">#318</a>).</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-mock/blob/main/CHANGELOG.rst">pytest-mock's changelog</a>.</em></p> <blockquote> <h2>3.10.0 (2022-10-05)</h2> <ul> <li>Added new <code>mocker.stop(m)</code> method to stop specific <code>mocker.patch</code> or <code>mocker.spy</code> calls (<code>[#319](https://github.com/pytest-dev/pytest-mock/issues/319)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/319">#319</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/319">pytest-dev/pytest-mock#319</a></p> <h2>3.9.0 (2022-09-28)</h2> <ul> <li>Expose <code>NonCallableMagicMock</code> via the <code>mocker</code> fixture (<code>[#318](https://github.com/pytest-dev/pytest-mock/issues/318)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/318">#318</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/318">pytest-dev/pytest-mock#318</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/6c03dfd4240de4a178bab67c0a32fba28d8bcf91"><code>6c03dfd</code></a> Release 3.10.0</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/fbb5039d7269c34705a7dab39f2a2cea92111859"><code>fbb5039</code></a> Implement selective un-spying and un-patching (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/319">#319</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/a1c7421daad8d6bc433db28a5df1b01bd0a93222"><code>a1c7421</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/321">#321</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/4f2703c94ce4838befc1ffef1c3bdca4ac1eccf2"><code>4f2703c</code></a> Add Python 3.11 support (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/320">#320</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/1e2001fb78aeb42ae068cc0c17075016d47fa1a7"><code>1e2001f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/318">#318</a> from willfrey/patch-2</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/64a34f64215d779dc0384acc3cdd5a164544a60a"><code>64a34f6</code></a> Update CHANGELOG for 3.9.0</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/4e31630aad7dca66258f232e6b62754dadd79f2b"><code>4e31630</code></a> Add test for NonCallableMagicMock</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/798f07e99773b05d284be6f4cb32e79d532965b5"><code>798f07e</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/317">#317</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/247b9d46e6fdfc696257c4daade9c08a195c45aa"><code>247b9d4</code></a> Expose NonCallableMagicMock in MockerFixture</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/0fd7fea3eece2e2dd09affeed39f0e3a50295f0d"><code>0fd7fea</code></a> Update link to notes about usage as context manager (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/313">#313</a>)</li> <li>Additional commits viewable in <a href="https://github.com/pytest-dev/pytest-mock/compare/v3.8.2...v3.10.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pytest-mock&package-manager=pip&previous-version=3.8.2&new-version=3.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [pytest-mock](https://github.com/pytest-dev/pytest-mock) from 3.8.2 to 3.10.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-mock/releases">pytest-mock's releases</a>.</em></p> <blockquote> <h2>v3.10.0</h2> <ul> <li>Added new <code>mocker.stop(m)</code> method to stop specific <code>mocker.patch</code> or <code>mocker.spy</code> calls (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/319">#319</a>).</li> </ul> <h2>v3.9.0</h2> <ul> <li>Expose <code>NonCallableMagicMock</code> via the <code>mocker</code> fixture (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/318">#318</a>).</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-mock/blob/main/CHANGELOG.rst">pytest-mock's changelog</a>.</em></p> <blockquote> <h2>3.10.0 (2022-10-05)</h2> <ul> <li>Added new <code>mocker.stop(m)</code> method to stop specific <code>mocker.patch</code> or <code>mocker.spy</code> calls (<code>[#319](https://github.com/pytest-dev/pytest-mock/issues/319)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/319">#319</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/319">pytest-dev/pytest-mock#319</a></p> <h2>3.9.0 (2022-09-28)</h2> <ul> <li>Expose <code>NonCallableMagicMock</code> via the <code>mocker</code> fixture (<code>[#318](https://github.com/pytest-dev/pytest-mock/issues/318)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/318">#318</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/318">pytest-dev/pytest-mock#318</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/6c03dfd4240de4a178bab67c0a32fba28d8bcf91"><code>6c03dfd</code></a> Release 3.10.0</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/fbb5039d7269c34705a7dab39f2a2cea92111859"><code>fbb5039</code></a> Implement selective un-spying and un-patching (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/319">#319</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/a1c7421daad8d6bc433db28a5df1b01bd0a93222"><code>a1c7421</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/321">#321</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/4f2703c94ce4838befc1ffef1c3bdca4ac1eccf2"><code>4f2703c</code></a> Add Python 3.11 support (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/320">#320</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/1e2001fb78aeb42ae068cc0c17075016d47fa1a7"><code>1e2001f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/318">#318</a> from willfrey/patch-2</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/64a34f64215d779dc0384acc3cdd5a164544a60a"><code>64a34f6</code></a> Update CHANGELOG for 3.9.0</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/4e31630aad7dca66258f232e6b62754dadd79f2b"><code>4e31630</code></a> Add test for NonCallableMagicMock</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/798f07e99773b05d284be6f4cb32e79d532965b5"><code>798f07e</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/317">#317</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/247b9d46e6fdfc696257c4daade9c08a195c45aa"><code>247b9d4</code></a> Expose NonCallableMagicMock in MockerFixture</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/0fd7fea3eece2e2dd09affeed39f0e3a50295f0d"><code>0fd7fea</code></a> Update link to notes about usage as context manager (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/313">#313</a>)</li> <li>Additional commits viewable in <a href="https://github.com/pytest-dev/pytest-mock/compare/v3.8.2...v3.10.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pytest-mock&package-manager=pip&previous-version=3.8.2&new-version=3.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
Updates the requirements on [pytest-mock](https://github.com/pytest-dev/pytest-mock) to permit the latest version. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-mock/releases">pytest-mock's releases</a>.</em></p> <blockquote> <h2>v3.10.0</h2> <ul> <li>Added new <code>mocker.stop(m)</code> method to stop specific <code>mocker.patch</code> or <code>mocker.spy</code> calls (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/319">#319</a>).</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-mock/blob/main/CHANGELOG.rst">pytest-mock's changelog</a>.</em></p> <blockquote> <h2>3.10.0 (2022-10-05)</h2> <ul> <li>Added new <code>mocker.stop(m)</code> method to stop specific <code>mocker.patch</code> or <code>mocker.spy</code> calls (<code>[#319](https://github.com/pytest-dev/pytest-mock/issues/319)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/319">#319</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/319">pytest-dev/pytest-mock#319</a></p> <h2>3.9.0 (2022-09-28)</h2> <ul> <li>Expose <code>NonCallableMagicMock</code> via the <code>mocker</code> fixture (<code>[#318](https://github.com/pytest-dev/pytest-mock/issues/318)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/318">#318</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/318">pytest-dev/pytest-mock#318</a></p> <h2>3.8.2 (2022-07-05)</h2> <ul> <li>Fixed <code>AsyncMock</code> support for Python 3.7+ in <code>mocker.async_stub</code> (<code>[#302](https://github.com/pytest-dev/pytest-mock/issues/302)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/302">#302</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/302">pytest-dev/pytest-mock#302</a></p> <h2>3.8.1 (2022-06-24)</h2> <ul> <li>Fixed regression caused by an explicit <code>mock</code> dependency in the code (<code>[#298](https://github.com/pytest-dev/pytest-mock/issues/298)</code>_).</li> </ul> <p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/298">#298</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/298">pytest-dev/pytest-mock#298</a></p> <h2>3.8.0 (2022-06-24)</h2> <ul> <li>Add <code>MockerFixture.async_mock</code> method. Thanks <code>@PerchunPak</code>_ for the PR (<code>[#296](https://github.com/pytest-dev/pytest-mock/issues/296)</code>_).</li> </ul> <p>.. _<a href="https://github.com/PerchunPak"><code>@PerchunPak</code></a>: <a href="https://github.com/PerchunPak">https://github.com/PerchunPak</a> .. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/296">#296</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/296">pytest-dev/pytest-mock#296</a></p> <h2>3.7.0 (2022-01-28)</h2> <ul> <li>Python 3.10 now officially supported.</li> <li>Dropped support for Python 3.6.</li> </ul> <h2>3.6.1 (2021-05-06)</h2> <ul> <li>Fix <code>mocker.resetall()</code> when using <code>mocker.spy()</code> (<code>[#237](https://github.com/pytest-dev/pytest-mock/issues/237)</code><em>). Thanks <code>@blaxter</code></em> for the report and <code>@shadycuz</code>_ for the PR.</li> </ul> <p>.. _<a href="https://github.com/blaxter"><code>@blaxter</code></a>: <a href="https://github.com/blaxter">https://github.com/blaxter</a> .. _<a href="https://github.com/shadycuz"><code>@shadycuz</code></a>: <a href="https://github.com/shadycuz">https://github.com/shadycuz</a> .. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/237">#237</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/237">pytest-dev/pytest-mock#237</a></p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/6c03dfd4240de4a178bab67c0a32fba28d8bcf91"><code>6c03dfd</code></a> Release 3.10.0</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/fbb5039d7269c34705a7dab39f2a2cea92111859"><code>fbb5039</code></a> Implement selective un-spying and un-patching (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/319">#319</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/a1c7421daad8d6bc433db28a5df1b01bd0a93222"><code>a1c7421</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/321">#321</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/4f2703c94ce4838befc1ffef1c3bdca4ac1eccf2"><code>4f2703c</code></a> Add Python 3.11 support (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/320">#320</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/1e2001fb78aeb42ae068cc0c17075016d47fa1a7"><code>1e2001f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/318">#318</a> from willfrey/patch-2</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/64a34f64215d779dc0384acc3cdd5a164544a60a"><code>64a34f6</code></a> Update CHANGELOG for 3.9.0</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/4e31630aad7dca66258f232e6b62754dadd79f2b"><code>4e31630</code></a> Add test for NonCallableMagicMock</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/798f07e99773b05d284be6f4cb32e79d532965b5"><code>798f07e</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/317">#317</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/247b9d46e6fdfc696257c4daade9c08a195c45aa"><code>247b9d4</code></a> Expose NonCallableMagicMock in MockerFixture</li> <li><a href="https://github.com/pytest-dev/pytest-mock/commit/0fd7fea3eece2e2dd09affeed39f0e3a50295f0d"><code>0fd7fea</code></a> Update link to notes about usage as context manager (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/313">#313</a>)</li> <li>Additional commits viewable in <a href="https://github.com/pytest-dev/pytest-mock/compare/v0.1.0...v3.10.0">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Ciborowski <dciborow@microsoft.com>
This merge request implements the possibility to stop specific spies rather than having to just stop them all.
Based on the patch of @nicoddemus in issue #259
Fixes #259