Modernize functional tests III #1562

mdellweg · 2023-08-25T08:24:17Z

[noissue]

mdellweg · 2023-08-25T10:54:47Z

pulp_ansible/tests/functional/api/role/test_crud_distribution.py

+    assert distribution.repository_version == repository.latest_version_href
+
+    if False:
+        # TODO This fails by complaining repository and version cannot be used together.


This is actually a pulpcore bug.

pulp/pulpcore#4325

gerrod3 · 2023-08-30T02:57:09Z

pulp_ansible/tests/functional/api/role/test_download_content.py

+    # TODO That's not how you get roles from galaxy v1...
+    assert pulp_hash is not None


Have you figured out how to get roles from galaxy v1?

Not yet. And also this test was skipped before. So do you think it brings new value, or should we remove it altogether?

I personally think this test doesn't add much value. We already test that we can download roles in the cli test when we check we can install a role from Pulp. I would suggest removing it.

gerrod3 · 2023-08-30T02:58:34Z

pulp_ansible/tests/functional/api/role/test_crud_distribution.py

+    if has_pulp_plugin("pulpcore", min="3.30.1"):
+        # On older versions, this fails complaining repository and version cannot be used together.


Nice use of has_pulp_plugin!

gerrod3 · 2023-08-30T02:59:58Z

pulp_ansible/app/serializers.py

@@ -358,6 +358,7 @@ class Meta:
            "pulp_href",
            "pulp_created",
            "base_path",
+            "base_url",


Should we really be exposing base_url for an ansible distribution? client_url is the url you are most likely to need and I think if we do expose it we need to add a feature log for it.

I'm going to remove it again and mark the dysfunctional test mentioned above skipped.
(Maybe we get back to the roles api eventually...)

[noissue]

patchback · 2023-09-21T18:02:49Z

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

❌ Failed to cleanly apply d5fb061 on top of patchback/backports/0.18/d5fb061f37cc42a0cea7df52f36347154a215c88/pr-1562

Backporting merged PR #1562 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/pulp_ansible.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/0.18/d5fb061f37cc42a0cea7df52f36347154a215c88/pr-1562 upstream/0.18

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

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/0.18/d5fb061f37cc42a0cea7df52f36347154a215c88/pr-1562

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.

mdellweg force-pushed the modern_tests branch 3 times, most recently from 21c3604 to ac3387a Compare August 25, 2023 10:28

mdellweg commented Aug 25, 2023

View reviewed changes

mdellweg force-pushed the modern_tests branch from ac3387a to 6e30c99 Compare August 25, 2023 10:55

mdellweg marked this pull request as ready for review August 25, 2023 10:55

mdellweg force-pushed the modern_tests branch 4 times, most recently from 7158c14 to 97d8a78 Compare August 26, 2023 08:10

gerrod3 reviewed Aug 30, 2023

View reviewed changes

mdellweg force-pushed the modern_tests branch from 97d8a78 to 6394d3b Compare August 30, 2023 07:18

Modernize functional tests III

959c8da

[noissue]

mdellweg force-pushed the modern_tests branch from 6394d3b to 959c8da Compare August 31, 2023 08:28

gerrod3 approved these changes Sep 1, 2023

View reviewed changes

mdellweg merged commit d5fb061 into pulp:main Sep 1, 2023
13 checks passed

mdellweg deleted the modern_tests branch September 1, 2023 06:23

gerrod3 added the backport-0.18 label Sep 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modernize functional tests III #1562

Modernize functional tests III #1562

mdellweg commented Aug 25, 2023

mdellweg Aug 25, 2023

mdellweg Aug 25, 2023

gerrod3 Aug 30, 2023

mdellweg Aug 30, 2023

gerrod3 Aug 30, 2023

gerrod3 Aug 30, 2023

gerrod3 Aug 30, 2023

mdellweg Aug 30, 2023

patchback bot commented Sep 21, 2023 •

edited

Loading

		# TODO That's not how you get roles from galaxy v1...
		assert pulp_hash is not None

		if has_pulp_plugin("pulpcore", min="3.30.1"):
		# On older versions, this fails complaining repository and version cannot be used together.

Modernize functional tests III #1562

Modernize functional tests III #1562

Conversation

mdellweg commented Aug 25, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

patchback bot commented Sep 21, 2023 • edited Loading

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

Backporting merged PR #1562 into main

patchback bot commented Sep 21, 2023 •

edited

Loading