Skip to content

Switch content 2.4 metadata upload test to use attrs package to avoid race condition with large sync test - #1310

Merged
gerrod3 merged 1 commit into
pulp:mainfrom
gerrod3:24-race
Jul 29, 2026
Merged

Switch content 2.4 metadata upload test to use attrs package to avoid race condition with large sync test#1310
gerrod3 merged 1 commit into
pulp:mainfrom
gerrod3:24-race

Conversation

@gerrod3

@gerrod3 gerrod3 commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

test_basic_pulp_to_pulp_sync uses the large python fixture to populate Pulp which includes setuptools. On sync we don't populate the metadata_version field since it isn't exposed in the pypi/json api, so if this test runs first then setuptools will not have the field set when the content is reused on the upload test. We should come up with a better long term solution but for now this should work.

📜 Checklist

  • Commits are cleanly separated with meaningful messages (simple features and bug fixes should be squashed to one commit)
  • A changelog entry or entries has been added for any significant changes
  • Follows the Pulp policy on AI Usage
  • (For new features) - User documentation and test coverage has been added

See: Pull Request Walkthrough

@jobselko

Copy link
Copy Markdown
Member

Do we want to backport this?

@gerrod3
gerrod3 merged commit c7fa145 into pulp:main Jul 29, 2026
14 checks passed
@patchback

patchback Bot commented Jul 29, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply c7fa145 on top of patchback/backports/3.27/c7fa1454ac6d806502bfe46be676ef73c50369a0/pr-1310

Backporting merged PR #1310 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.27/c7fa1454ac6d806502bfe46be676ef73c50369a0/pr-1310 upstream/3.27
  4. Now, cherry-pick PR Switch content 2.4 metadata upload test to use attrs package to avoid race condition with large sync test #1310 contents into that branch:
    $ git cherry-pick -x c7fa1454ac6d806502bfe46be676ef73c50369a0
    If it'll yell at you with something like fatal: Commit c7fa1454ac6d806502bfe46be676ef73c50369a0 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x c7fa1454ac6d806502bfe46be676ef73c50369a0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Switch content 2.4 metadata upload test to use attrs package to avoid race condition with large sync test #1310 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.27/c7fa1454ac6d806502bfe46be676ef73c50369a0/pr-1310
  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

patchback Bot commented Jul 29, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply c7fa145 on top of patchback/backports/3.19/c7fa1454ac6d806502bfe46be676ef73c50369a0/pr-1310

Backporting merged PR #1310 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.19/c7fa1454ac6d806502bfe46be676ef73c50369a0/pr-1310 upstream/3.19
  4. Now, cherry-pick PR Switch content 2.4 metadata upload test to use attrs package to avoid race condition with large sync test #1310 contents into that branch:
    $ git cherry-pick -x c7fa1454ac6d806502bfe46be676ef73c50369a0
    If it'll yell at you with something like fatal: Commit c7fa1454ac6d806502bfe46be676ef73c50369a0 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x c7fa1454ac6d806502bfe46be676ef73c50369a0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Switch content 2.4 metadata upload test to use attrs package to avoid race condition with large sync test #1310 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.19/c7fa1454ac6d806502bfe46be676ef73c50369a0/pr-1310
  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

patchback Bot commented Jul 29, 2026

Copy link
Copy Markdown

Backport to 3.32: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.32/c7fa1454ac6d806502bfe46be676ef73c50369a0/pr-1310

Backported as #1311

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