Fix GetOrCreateSerializerMixin not working with pulp_domain #6078

gerrod3 · 2024-11-26T15:49:05Z

pulp_domain is not processed in model's serializer since the value is auto-set as a context var on request time. This helper method would run into serializer errors if pulp_domain was specified as a natural key (which you need to do when supporting domains).

mdellweg · 2024-11-26T16:51:55Z

pulpcore/tests/unit/serializers/test_base.py

@@ -108,3 +115,27 @@ def test_ignored_fields_no_side_effects():
    initial_data = {"field1": 1, "csrfmiddlewaretoken": 2}
    defined_fields = {"field1": 1}
    validate_unknown_fields(initial_data, defined_fields)
+
+
+class TestGetOrCreateSerializerMixin(TestCase):


Can you try if this creates valid pytest tests?

Suggested change

class TestGetOrCreateSerializerMixin(TestCase):

class TestGetOrCreateSerializerMixin():

Looks like the setUp function may not be called with that name.
Also pytest really suggests to move to fixtures.

Are there some docs or examples of unit tests with fixtures that hit the database? I was basing my tests off examples in pulp_container.

I think this doc applies here.
https://pytest-django.readthedocs.io/en/latest/helpers.html#db

Thanks, rewrote it the fixture way.

mdellweg · 2024-11-26T17:01:48Z

pulpcore/tests/unit/serializers/test_base.py

@@ -108,3 +115,27 @@ def test_ignored_fields_no_side_effects():
    initial_data = {"field1": 1, "csrfmiddlewaretoken": 2}
    defined_fields = {"field1": 1}
    validate_unknown_fields(initial_data, defined_fields)
+
+
+class TestGetOrCreateSerializerMixin(TestCase):


Looks like the setUp function may not be called with that name.
Also pytest really suggests to move to fixtures.

dralley · 2024-11-26T18:22:56Z

If we're backporting this, it would be nice to have an issue filed

gerrod3 · 2024-11-26T19:07:05Z

If we're backporting this, it would be nice to have an issue filed

Can this PR be the issue? Don't feel that we will get much benefit out of creating a duplicate issue that has no new information.

patchback · 2024-12-03T14:47:49Z

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

❌ Failed to cleanly apply ed27c95 on top of patchback/backports/3.39/ed27c950a713ed71493cd39d0b0baceabed33b36/pr-6078

Backporting merged PR #6078 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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.39/ed27c950a713ed71493cd39d0b0baceabed33b36/pr-6078 upstream/3.39

Now, cherry-pick PR Fix GetOrCreateSerializerMixin not working with pulp_domain #6078 contents into that branch:
```
$ git cherry-pick -x ed27c950a713ed71493cd39d0b0baceabed33b36
```
If it'll yell at you with something like fatal: Commit ed27c950a713ed71493cd39d0b0baceabed33b36 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x ed27c950a713ed71493cd39d0b0baceabed33b36
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Fix GetOrCreateSerializerMixin not working with pulp_domain #6078 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.39/ed27c950a713ed71493cd39d0b0baceabed33b36/pr-6078

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 · 2024-12-03T14:48:00Z

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

❌ Failed to cleanly apply ed27c95 on top of patchback/backports/3.28/ed27c950a713ed71493cd39d0b0baceabed33b36/pr-6078

Backporting merged PR #6078 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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.28/ed27c950a713ed71493cd39d0b0baceabed33b36/pr-6078 upstream/3.28

Now, cherry-pick PR Fix GetOrCreateSerializerMixin not working with pulp_domain #6078 contents into that branch:
```
$ git cherry-pick -x ed27c950a713ed71493cd39d0b0baceabed33b36
```
If it'll yell at you with something like fatal: Commit ed27c950a713ed71493cd39d0b0baceabed33b36 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x ed27c950a713ed71493cd39d0b0baceabed33b36
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Fix GetOrCreateSerializerMixin not working with pulp_domain #6078 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.28/ed27c950a713ed71493cd39d0b0baceabed33b36/pr-6078

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 · 2024-12-03T14:48:11Z

Backport to 3.49: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.49/ed27c950a713ed71493cd39d0b0baceabed33b36/pr-6078

Backported as #6106

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

patchback · 2024-12-03T14:48:24Z

Backport to 3.63: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.63/ed27c950a713ed71493cd39d0b0baceabed33b36/pr-6078

Backported as #6107

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

patchback · 2024-12-03T14:48:37Z

Backport to 3.68: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.68/ed27c950a713ed71493cd39d0b0baceabed33b36/pr-6078

Backported as #6108

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

gerrod3 added backport-3.39 backport-3.28 backport-3.49 backport-3.63 backport-3.68 labels Nov 26, 2024

github-actions bot added the no-issue label Nov 26, 2024

gerrod3 force-pushed the goc-mixin-domain branch from cf42aea to 2b3742d Compare November 26, 2024 15:50

mdellweg reviewed Nov 26, 2024

View reviewed changes

mdellweg previously approved these changes Nov 26, 2024

View reviewed changes

gerrod3 dismissed mdellweg’s stale review via c91e1e1 November 26, 2024 17:26

gerrod3 force-pushed the goc-mixin-domain branch from 2b3742d to c91e1e1 Compare November 26, 2024 17:26

Fix GetOrCreateSerializerMixin not working with pulp_domain

56d8674

gerrod3 force-pushed the goc-mixin-domain branch from c91e1e1 to 56d8674 Compare November 26, 2024 17:27

mdellweg approved these changes Nov 26, 2024

View reviewed changes

gerrod3 merged commit ed27c95 into pulp:main Dec 3, 2024
12 checks passed

gerrod3 deleted the goc-mixin-domain branch December 3, 2024 14:47

patchback bot mentioned this pull request Dec 3, 2024

[PR #6078/ed27c950 backport][3.49] Fix GetOrCreateSerializerMixin not working with pulp_domain #6106

Merged

patchback bot mentioned this pull request Dec 3, 2024

[PR #6078/ed27c950 backport][3.63] Fix GetOrCreateSerializerMixin not working with pulp_domain #6107

Merged

patchback bot mentioned this pull request Dec 3, 2024

[PR #6078/ed27c950 backport][3.68] Fix GetOrCreateSerializerMixin not working with pulp_domain #6108

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix GetOrCreateSerializerMixin not working with pulp_domain #6078

Fix GetOrCreateSerializerMixin not working with pulp_domain #6078

gerrod3 commented Nov 26, 2024

mdellweg Nov 26, 2024

mdellweg Nov 26, 2024

gerrod3 Nov 26, 2024

mdellweg Nov 26, 2024

gerrod3 Nov 26, 2024

mdellweg Nov 26, 2024

dralley commented Nov 26, 2024

gerrod3 commented Nov 26, 2024

patchback bot commented Dec 3, 2024 •

edited

Loading

patchback bot commented Dec 3, 2024 •

edited

Loading

patchback bot commented Dec 3, 2024 •

edited

Loading

patchback bot commented Dec 3, 2024 •

edited

Loading

patchback bot commented Dec 3, 2024 •

edited

Loading

	class TestGetOrCreateSerializerMixin(TestCase):
	class TestGetOrCreateSerializerMixin():

Fix GetOrCreateSerializerMixin not working with pulp_domain #6078

Fix GetOrCreateSerializerMixin not working with pulp_domain #6078

Conversation

gerrod3 commented Nov 26, 2024

mdellweg Nov 26, 2024

Choose a reason for hiding this comment

mdellweg Nov 26, 2024

Choose a reason for hiding this comment

gerrod3 Nov 26, 2024

Choose a reason for hiding this comment

mdellweg Nov 26, 2024

Choose a reason for hiding this comment

gerrod3 Nov 26, 2024

Choose a reason for hiding this comment

mdellweg Nov 26, 2024

Choose a reason for hiding this comment

dralley commented Nov 26, 2024

gerrod3 commented Nov 26, 2024

patchback bot commented Dec 3, 2024 • edited Loading

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

Backporting merged PR #6078 into main

patchback bot commented Dec 3, 2024 • edited Loading

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

Backporting merged PR #6078 into main

patchback bot commented Dec 3, 2024 • edited Loading

Backport to 3.49: 💚 backport PR created

patchback bot commented Dec 3, 2024 • edited Loading

Backport to 3.63: 💚 backport PR created

patchback bot commented Dec 3, 2024 • edited Loading

Backport to 3.68: 💚 backport PR created

patchback bot commented Dec 3, 2024 •

edited

Loading

patchback bot commented Dec 3, 2024 •

edited

Loading

patchback bot commented Dec 3, 2024 •

edited

Loading

patchback bot commented Dec 3, 2024 •

edited

Loading

patchback bot commented Dec 3, 2024 •

edited

Loading