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

test helper: add support for check and diff modes #9666

Merged

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Feb 1, 2025

SUMMARY

Add support for check and diff flags in test helper.

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

tests/unit/plugins/modules/helper.py
tests/unit/plugins/modules/test_gio_mime.yaml

@ansibullbot ansibullbot added tests tests unit tests/unit labels Feb 1, 2025
@russoz russoz merged commit c0f57b5 into ansible-collections:main Feb 1, 2025
138 checks passed
@russoz russoz deleted the test-helper-check-mode branch February 1, 2025 13:21
@felixfontein felixfontein added the backport-10 Automatically create a backport for the stable-10 branch label Feb 1, 2025
Copy link

patchback bot commented Feb 1, 2025

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

❌ Failed to cleanly apply c0f57b5 on top of patchback/backports/stable-10/c0f57b5c620a5d13b17aaaf6c446208a9cd3ef44/pr-9666

Backporting merged PR #9666 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-10/c0f57b5c620a5d13b17aaaf6c446208a9cd3ef44/pr-9666 upstream/stable-10
  4. Now, cherry-pick PR test helper: add support for check and diff modes #9666 contents into that branch:
    $ git cherry-pick -x c0f57b5c620a5d13b17aaaf6c446208a9cd3ef44
    If it'll yell at you with something like fatal: Commit c0f57b5c620a5d13b17aaaf6c446208a9cd3ef44 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x c0f57b5c620a5d13b17aaaf6c446208a9cd3ef44
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR test helper: add support for check and diff modes #9666 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-10/c0f57b5c620a5d13b17aaaf6c446208a9cd3ef44/pr-9666
  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.

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

Successfully merging this pull request may close these issues.

3 participants