Skip to content

Conversation

@jobselko
Copy link
Contributor

@jobselko jobselko commented Jun 27, 2025

This PR updates constants in the tests to account for the new fixtures added in pulp/pulp-fixtures#254.

Fixes #876

@jobselko jobselko self-assigned this Jun 27, 2025
@jobselko jobselko merged commit ee1aed2 into pulp:main Jul 1, 2025
13 checks passed
@patchback
Copy link

patchback bot commented Jul 1, 2025

Backport to 3.11: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.11/ee1aed2b7412b58a8803fe54a1e241ae3f6471af/pr-877

Backported as #882

🤖 @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 Jul 1, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
@patchback
Copy link

patchback bot commented Jul 1, 2025

Backport to 3.12: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.12/ee1aed2b7412b58a8803fe54a1e241ae3f6471af/pr-877

Backported as #883

🤖 @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 Jul 1, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
@patchback
Copy link

patchback bot commented Jul 1, 2025

Backport to 3.16: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.16/ee1aed2b7412b58a8803fe54a1e241ae3f6471af/pr-877

Backported as #884

🤖 @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 Jul 1, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
jobselko added a commit that referenced this pull request Jul 1, 2025
…12b58a8803fe54a1e241ae3f6471af/pr-877

[PR #877/ee1aed2b backport][3.11] Fix tests to account for new fixtures
jobselko added a commit that referenced this pull request Jul 1, 2025
…12b58a8803fe54a1e241ae3f6471af/pr-877

[PR #877/ee1aed2b backport][3.12] Fix tests to account for new fixtures
jobselko added a commit that referenced this pull request Jul 1, 2025
…12b58a8803fe54a1e241ae3f6471af/pr-877

[PR #877/ee1aed2b backport][3.16] Fix tests to account for new fixtures
@patchback
Copy link

patchback bot commented Jul 7, 2025

Backport to 3.13: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.13/ee1aed2b7412b58a8803fe54a1e241ae3f6471af/pr-877

Backported as #888

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

@patchback
Copy link

patchback bot commented Jul 7, 2025

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

❌ Failed to cleanly apply ee1aed2 on top of patchback/backports/3.10/ee1aed2b7412b58a8803fe54a1e241ae3f6471af/pr-877

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

(cherry picked from commit ee1aed2)
mdellweg pushed a commit to mdellweg/pulp_python that referenced this pull request Jul 8, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
(cherry picked from commit 7433f61)
mdellweg pushed a commit to mdellweg/pulp_python that referenced this pull request Jul 8, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
(cherry picked from commit 7433f61)
mdellweg added a commit that referenced this pull request Jul 8, 2025
…12b58a8803fe54a1e241ae3f6471af/pr-877

[PR #877/ee1aed2b backport][3.13] Fix tests to account for new fixtures
mdellweg pushed a commit to mdellweg/pulp_python that referenced this pull request Jul 8, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
(cherry picked from commit 7433f61)
mdellweg pushed a commit to mdellweg/pulp_python that referenced this pull request Jul 8, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
(cherry picked from commit 7433f61)
mdellweg pushed a commit to mdellweg/pulp_python that referenced this pull request Jul 8, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
(cherry picked from commit 7433f61)
mdellweg pushed a commit to mdellweg/pulp_python that referenced this pull request Jul 8, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
(cherry picked from commit 7433f61)
mdellweg pushed a commit to mdellweg/pulp_python that referenced this pull request Jul 8, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
(cherry picked from commit 7433f61)
mdellweg pushed a commit to mdellweg/pulp_python that referenced this pull request Jul 8, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
(cherry picked from commit 7433f61)
mdellweg pushed a commit to mdellweg/pulp_python that referenced this pull request Jul 8, 2025
Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
(cherry picked from commit 7433f61)
@jobselko jobselko deleted the fix_nightly branch July 23, 2025 11:51
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.

Nightly CI is failing after updating pulp-fixtures

2 participants