Skip to content

Remove invalid cookie test#6642

Merged
mdellweg merged 1 commit intopulp:mainfrom
mdellweg:nightly_fix
Jun 4, 2025
Merged

Remove invalid cookie test#6642
mdellweg merged 1 commit intopulp:mainfrom
mdellweg:nightly_fix

Conversation

@mdellweg
Copy link
Copy Markdown
Member

@mdellweg mdellweg commented Jun 4, 2025

A change in aiohttp now accepts basically all invalid cookies and additionally stops failing on the ones left. The content-app will never fail the request based on cookies anymore.

aio-libs/aiohttp#11112

A change in aiohttp now accepts basically all invalid cookies and
additionally stops failing on the ones left. The content-app will
never fail the request based on cookies anymore.

aio-libs/aiohttp#11112
@mdellweg mdellweg marked this pull request as ready for review June 4, 2025 11:08
@mdellweg mdellweg enabled auto-merge (rebase) June 4, 2025 11:44
@mdellweg mdellweg merged commit 375bf76 into pulp:main Jun 4, 2025
12 checks passed
@mdellweg mdellweg deleted the nightly_fix branch June 4, 2025 12:22
@patchback
Copy link
Copy Markdown

patchback bot commented Jun 4, 2025

Backport to 3.63: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 375bf76 on top of patchback/backports/3.63/375bf76c6b5e01ec17030f38d9734d28953d6e8c/pr-6642

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

@patchback
Copy link
Copy Markdown

patchback bot commented Jun 4, 2025

Backport to 3.73: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.73/375bf76c6b5e01ec17030f38d9734d28953d6e8c/pr-6642

Backported as #6643

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

@patchback
Copy link
Copy Markdown

patchback bot commented Jun 4, 2025

Backport to 3.80: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.80/375bf76c6b5e01ec17030f38d9734d28953d6e8c/pr-6642

Backported as #6644

🤖 @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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants