Skip to content

Conversation

@ycedres
Copy link
Contributor

@ycedres ycedres commented Nov 29, 2023

What does this PR do?

This PR causes the test suite to use unittest.mock instead of mock for supported Python versions, so the usage of standard library components is favoured.

To achieve this, the __version__ variable is removed as it was dropped from Python 3.9 and it's almost not used.

The results of the test suite do not change.

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@ycedres ycedres requested a review from a team as a code owner November 29, 2023 17:21
@ycedres ycedres requested review from whytewolf and removed request for a team November 29, 2023 17:21
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title Use unittest.mock for newer Python versions [master] Use unittest.mock for newer Python versions Nov 29, 2023
@ycedres ycedres force-pushed the selective-mock-import branch from afdb42f to 31e53e4 Compare November 29, 2023 17:24
@ycedres ycedres force-pushed the selective-mock-import branch from 31e53e4 to 6e11d41 Compare November 30, 2023 11:45
@ycedres ycedres force-pushed the selective-mock-import branch from 6e11d41 to 7e83c93 Compare November 30, 2023 13:01
@ycedres ycedres force-pushed the selective-mock-import branch from c119bc3 to 95c9ed9 Compare December 1, 2023 09:38
@dwoz dwoz added this to the Argon v3008.0 milestone Dec 18, 2023
agraul pushed a commit to agraul/salt that referenced this pull request Jan 27, 2025
@dwoz dwoz requested a review from a team as a code owner March 16, 2025 22:09
Copy link
Contributor

@twangboy twangboy left a comment

Choose a reason for hiding this comment

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

This needs to be rebased and conflicts resolved.

@twangboy twangboy added Tests merge-conflict PR has a merge conflict test:full Run the full test suite labels Jul 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge-conflict PR has a merge conflict test:full Run the full test suite Tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants