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

Fix/improve tests #9859

Merged
merged 2 commits into from
Mar 9, 2025
Merged

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

More extractions from #9833.

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

various integration 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 9, 2025
@ansibullbot ansibullbot added integration tests/integration tests tests labels Mar 9, 2025
@felixfontein
Copy link
Collaborator Author

The | d() to | default() changes are not strictly necessary, but they currently trigger a bug in Data Tagging: ansible/ansible#84798

@felixfontein
Copy link
Collaborator Author

CC @russoz

@felixfontein felixfontein merged commit eff25c8 into ansible-collections:main Mar 9, 2025
141 checks passed
Copy link

patchback bot commented Mar 9, 2025

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

❌ Failed to cleanly apply eff25c8 on top of patchback/backports/stable-9/eff25c8a6ef7c5012ccf5efaec9d6ca1c678ccb7/pr-9859

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

Copy link

patchback bot commented Mar 9, 2025

Backport to stable-10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-10/eff25c8a6ef7c5012ccf5efaec9d6ca1c678ccb7/pr-9859

Backported as #9860

🤖 @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 9, 2025 15:48
patchback bot pushed a commit that referenced this pull request Mar 9, 2025
* Fix tests.

* Improve callback tests.

(cherry picked from commit eff25c8)
felixfontein added a commit to felixfontein/community.general that referenced this pull request Mar 9, 2025
* Fix tests.

* Improve callback tests.

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

Manual backport to stable-9 in #9861.

felixfontein added a commit that referenced this pull request Mar 9, 2025
Fix/improve tests (#9859)

* Fix tests.

* Improve callback tests.

(cherry picked from commit eff25c8)

Co-authored-by: Felix Fontein <[email protected]>
felixfontein added a commit that referenced this pull request Mar 9, 2025
Fix/improve tests (#9859)

* Fix tests.

* Improve callback tests.

(cherry picked from commit eff25c8)
austinlucaslake pushed a commit to austinlucaslake/community.general that referenced this pull request Mar 14, 2025
* Fix tests.

* Improve callback tests.
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 integration tests/integration tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants