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 unsafe text assertion in tests #716

Merged

Conversation

gravesm
Copy link
Member

@gravesm gravesm commented May 14, 2024

SUMMARY

This fixes a problem with unsafe text in an assertion.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION

This fixes a problem with unsafe text in an assertion.
Copy link

Copy link

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/b678f15b368d4f1480cb40f114d1677a

✔️ ansible-galaxy-importer SUCCESS in 3m 44s
✔️ build-ansible-collection SUCCESS in 10m 01s

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 8858b19 into ansible-collections:main May 15, 2024
70 checks passed
Copy link

patchback bot commented May 15, 2024

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

❌ Failed to cleanly apply 8858b19 on top of patchback/backports/stable-3/8858b191213765e53049e254db35ef2d0ca754cc/pr-716

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

@gravesm gravesm deleted the fix-unsafe branch May 15, 2024 12:31
gravesm added a commit to gravesm/kubernetes.core that referenced this pull request May 15, 2024
Fix unsafe text assertion in tests

SUMMARY

This fixes a problem with unsafe text in an assertion.

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: GomathiselviS
Reviewed-by: Bikouo Aubin
(cherry picked from commit 8858b19)
softwarefactory-project-zuul bot pushed a commit that referenced this pull request May 15, 2024
[Manual backport/stable-3] Fix unsafe text assertion in tests (#716)

Fix unsafe text assertion in tests
SUMMARY
This fixes a problem with unsafe text in an assertion.
ISSUE TYPE
Bugfix Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION
Reviewed-by: GomathiselviS
Reviewed-by: Bikouo Aubin
(cherry picked from commit 8858b19)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants