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

Unit tests: make set_module_args() a context manager, and remove copies of it in some tests #9838

Merged
merged 1 commit into from
Mar 7, 2025

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Prepares for Data Tagging.

Adjustd version of the corresponding commit in #9833.

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

various module unit tests

@felixfontein felixfontein added backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch labels Mar 7, 2025
@felixfontein
Copy link
Collaborator Author

CC @russoz

@ansibullbot
Copy link
Collaborator

@felixfontein This PR was evaluated as a potentially problematic PR for the following reasons:

  • More than 50 changed files.

Such PR can only be merged by human. Contact a Core team member to review this PR on IRC: #ansible-devel on Libera.chat IRC

click here for bot help

@ansibullbot ansibullbot added needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Mar 7, 2025
@felixfontein
Copy link
Collaborator Author

bot_skip

@felixfontein felixfontein removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html labels Mar 7, 2025
@felixfontein felixfontein merged commit a1781d0 into ansible-collections:main Mar 7, 2025
141 checks passed
Copy link

patchback bot commented Mar 7, 2025

Backport to stable-9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a1781d0 on top of patchback/backports/stable-9/a1781d09dd59adcb009d2f9e852c2c5ecd200ef7/pr-9838

Backporting merged PR #9838 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-9/a1781d09dd59adcb009d2f9e852c2c5ecd200ef7/pr-9838 upstream/stable-9
  4. Now, cherry-pick PR Unit tests: make set_module_args() a context manager, and remove copies of it in some tests #9838 contents into that branch:
    $ git cherry-pick -x a1781d09dd59adcb009d2f9e852c2c5ecd200ef7
    If it'll yell at you with something like fatal: Commit a1781d09dd59adcb009d2f9e852c2c5ecd200ef7 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x a1781d09dd59adcb009d2f9e852c2c5ecd200ef7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Unit tests: make set_module_args() a context manager, and remove copies of it in some tests #9838 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-9/a1781d09dd59adcb009d2f9e852c2c5ecd200ef7/pr-9838
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein deleted the tests branch March 7, 2025 06:21
Copy link

patchback bot commented Mar 7, 2025

Backport to stable-10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-10/a1781d09dd59adcb009d2f9e852c2c5ecd200ef7/pr-9838

Backported as #9839

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Mar 7, 2025
…es of it in some tests (#9838)

Make set_module_args() a context manager, and remove copies of set_module_args().

Prepares for Data Tagging.

(cherry picked from commit a1781d0)
felixfontein added a commit to felixfontein/community.general that referenced this pull request Mar 7, 2025
…es of it in some tests (ansible-collections#9838)

Make set_module_args() a context manager, and remove copies of set_module_args().

Prepares for Data Tagging.

(cherry picked from commit a1781d0)
@felixfontein
Copy link
Collaborator Author

Backport to stable-9 in #9840.

felixfontein added a commit that referenced this pull request Mar 7, 2025
…rgs() a context manager, and remove copies of it in some tests (#9839)

Unit tests: make set_module_args() a context manager, and remove copies of it in some tests (#9838)

Make set_module_args() a context manager, and remove copies of set_module_args().

Prepares for Data Tagging.

(cherry picked from commit a1781d0)

Co-authored-by: Felix Fontein <[email protected]>
felixfontein added a commit that referenced this pull request Mar 7, 2025
…remove copies of it in some tests (#9840)

Unit tests: make set_module_args() a context manager, and remove copies of it in some tests (#9838)

Make set_module_args() a context manager, and remove copies of set_module_args().

Prepares for Data Tagging.

(cherry picked from commit a1781d0)
austinlucaslake pushed a commit to austinlucaslake/community.general that referenced this pull request Mar 14, 2025
…es of it in some tests (ansible-collections#9838)

Make set_module_args() a context manager, and remove copies of set_module_args().

Prepares for Data Tagging.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants