Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Converted constants using pulp fixtures in fedorapeople to fixtures.pulpproject #7852

Merged
merged 2 commits into from
Jul 27, 2020

Conversation

Griffin-Sullivan
Copy link
Contributor

@Griffin-Sullivan Griffin-Sullivan commented Jun 24, 2020

With the update to fixtures.pulpproject.org, the depracated SRPM and DRPM repos from fedorapeople needed to be updated. Both repos now use the srpm-signed and drpm-signed endpoints in fixtures.pulpproject.org. The large_errata used in the FAKE_7_YUM_REPO in constants.py will now rely on https://fixtures.pulpproject.org/rpm-long-updateinfo/. Along with these changes, the CUSTOM_RPM_REPO, FAKE_YUM_SRPM_DUPLICATE_REPO, CUSTOM_RPM_SHA_512, and FAKE_0_YUM_REPO_STRING_BASED_VERSIONS repos will now be using fixtures.pulpproject.

============================ test session starts ==============================
platform linux -- Python 3.8.3, pytest-4.6.9, py-1.8.0, pluggy-0.13.0
shared_function enabled - OFF - scope: - storage: file
rootdir: /home/gsulliva/Programming/robottelo
plugins: mock-1.10.4, services-1.3.1, forked-1.1.3, xdist-1.32.0, cov-2.9.0
collecting ... 2020-06-24 19:38:12 - conftest - DEBUG - Collected 12 test cases
collected 12 items

cli/test_repository.py ...sss [ 50%]
api/test_repository.py .sss.. [100%]

=================== 6 passed, 6 skipped in 311.38 seconds ========================

============================= test session starts ==============================
platform linux -- Python 3.8.3, pytest-4.6.9, py-1.8.0, pluggy-0.13.0
shared_function enabled - OFF - scope: - storage: file
rootdir: /home/gsulliva/Programming/robottelo
plugins: mock-1.10.4, services-1.3.1, forked-1.1.3, xdist-1.32.0, cov-2.9.0
collecting ... 2020-06-30 13:02:28 - conftest - DEBUG - Collected 1 test cases
collected 1 item

test_contentmanagement.py . [100%]

========================== 1 passed in 119.64 seconds ==========================

============================== test session starts =============================
platform linux -- Python 3.8.3, pytest-4.6.9, py-1.8.0, pluggy-0.13.0
shared_function enabled - OFF - scope: - storage: file
rootdir: /home/gsulliva/Programming/robottelo
plugins: mock-1.10.4, services-1.3.1, forked-1.1.3, xdist-1.32.0, cov-2.9.0
collecting ... 2020-07-02 18:43:30 - conftest - DEBUG - Collected 6 test cases
collected 6 items

api/test_repository.py . [ 16%]
api/test_contentview.py . [ 33%]
api/test_repository.py .. [ 66%]
endtoend/test_api_endtoend.py . [ 83%]
endtoend/test_cli_endtoend.py . [100%]

========================== 6 passed in 936.83 seconds ==========================

@codecov
Copy link

codecov bot commented Jun 24, 2020

Codecov Report

Merging #7852 into master will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #7852   +/-   ##
=======================================
  Coverage   67.05%   67.05%           
=======================================
  Files          31       31           
  Lines        4016     4016           
=======================================
  Hits         2693     2693           
  Misses       1323     1323           
Impacted Files Coverage Δ
robottelo/constants.py 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6b01816...0efcf28. Read the comment docs.

@@ -72,6 +73,7 @@ class ContentManagementTestCase(APITestCase):
"""

@tier2
@pytest.mark.skip("Uses old large_errata repo from repos.fedorapeople")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @Griffin-Sullivan, first a minor point: your initial comment only mentions SRPM and DRPM repos. You should mention why you are making this change. More important, as this test is for the "ContentManagement" component we should ensure @latran knows about this change (He is primary owner of "Content Management" tests).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@swadeley @Griffin-Sullivan has this been resolved?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JacobCallahan I updated the commit message, and I'm waiting for @latran to look everything over. I'm working on changing this line altogether, as we will use the https://fixtures.pulpproject.org/rpm-long-updateinfo/ repo to replace large_errata.

Copy link
Contributor

@latran latran Jun 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Griffin-Sullivan - content management is disabled/discontinued since February. I plan on either deleting the entirety of test_contentmanagement.py and moving the test cases to the specific component area where it suits the test cases. I'm fine with the overall changes for the time being and we can merge. I'll just have to move the test cases either by myself or work with you on that later.

Copy link
Contributor

@swadeley swadeley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

but I see two changes at least (CUSTOM_FILE_REPO and import pytest) are also in:
Update robottelo to use fixtures.pulpproject.org #7849

You will need to rebase the one when the other is approved.
EDIT: sorry, the github system will check for conflicts, if no conflicts, then no need rebase
EDIT: The skip decorator above test_positive_sync_repos_with_large_errata is also in the earlier PR.

Copy link
Contributor

@omkarkhatavkar omkarkhatavkar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

@daviddavis
Copy link

This looks great. Do you need me to look into moving https://repos.fedorapeople.org/pulp/pulp/demo_repos/large_errata/zoo/ over to fixtures.pulpproject.org?

@Griffin-Sullivan
Copy link
Contributor Author

Yes, @daviddavis that would be very helpful!

@daviddavis
Copy link

daviddavis commented Jun 29, 2020

@Griffin-Sullivan it looks like the test_positive_sync_repos_with_large_errata test is only testing that katello is able to sync repos with lots of errata. I think you could probably use https://fixtures.pulpproject.org/rpm-long-updateinfo/ instead.

@Griffin-Sullivan
Copy link
Contributor Author

@daviddavis Ok I will try that out and make a new PR if all goes well.

@Griffin-Sullivan Griffin-Sullivan changed the title Switched SRPM and DRPM repos to pulpproject Switched SRPM, DRPM, and large_errata repos to pulpproject Jul 1, 2020
Changed the CUSTOM_FILE_REPO constant to use fixtures.pulpproject and skipped all tests affected by DRPM, SRPM, and FAKE_7_YUM_REPO. New DRPM, SRPM, and FAKE_7_YUM_REPO will need to be created manually and ran locally.
…ulpproject

With the update to fixtures.pulpproject.org, the depracated SRPM and DRPM repos from fedorapeople needed to be updated. Both repos now use the srpm-signed and drpm-signed endpoints in fixtures.pulpproject.org. The large_errata used in the FAKE_7_YUM_REPO in constants.py will now rely on https://fixtures.pulpproject.org/rpm-long-updateinfo/. Along with these changes, the CUSTOM_RPM_REPO, FAKE_YUM_SRPM_DUPLICATE_REPO, CUSTOM_RPM_SHA_512, and FAKE_0_YUM_REPO_STRING_BASED_VERSIONS repos will now be using fixtures.pulpproject.

============================ test session starts =============================
platform linux -- Python 3.8.3, pytest-4.6.9, py-1.8.0, pluggy-0.13.0
shared_function enabled - OFF - scope:  - storage: file
rootdir: /home/gsulliva/Programming/robottelo
plugins: mock-1.10.4, services-1.3.1, forked-1.1.3, xdist-1.32.0, cov-2.9.0
collecting ... 2020-06-24 19:38:12 - conftest - DEBUG - Collected 12 test cases
collected 12 items

cli/test_repository.py ...sss                                          [ 50%]
api/test_repository.py .sss..                                          [100%]

=================== 6 passed, 6 skipped in 311.38 seconds ====================

============================= test session starts ==============================
platform linux -- Python 3.8.3, pytest-4.6.9, py-1.8.0, pluggy-0.13.0
shared_function enabled - OFF - scope:  - storage: file
rootdir: /home/gsulliva/Programming/robottelo
plugins: mock-1.10.4, services-1.3.1, forked-1.1.3, xdist-1.32.0, cov-2.9.0
collecting ... 2020-06-30 13:02:28 - conftest - DEBUG - Collected 1 test cases
collected 1 item

test_contentmanagement.py .                                              [100%]

========================== 1 passed in 119.64 seconds ==========================

============================== test session starts =============================
platform linux -- Python 3.8.3, pytest-4.6.9, py-1.8.0, pluggy-0.13.0
shared_function enabled - OFF - scope:  - storage: file
rootdir: /home/gsulliva/Programming/robottelo
plugins: mock-1.10.4, services-1.3.1, forked-1.1.3, xdist-1.32.0, cov-2.9.0
collecting ... 2020-07-02 18:43:30 - conftest - DEBUG - Collected 6 test cases
collected 6 items

api/test_repository.py .                                                 [ 16%]
api/test_contentview.py .                                                [ 33%]
api/test_repository.py ..                                                [ 66%]
endtoend/test_api_endtoend.py .                                          [ 83%]
endtoend/test_cli_endtoend.py .                                          [100%]

========================== 6 passed in 936.83 seconds ==========================
@Griffin-Sullivan Griffin-Sullivan changed the title Switched SRPM, DRPM, and large_errata repos to pulpproject Converted constants using pulp fixtures in fedorapeople to fixtures.pulpproject Jul 6, 2020
@Griffin-Sullivan
Copy link
Contributor Author

@JacobCallahan @latran @omkarkhatavkar @swadeley Can you all take another look at this? There were 4 additional repos that needed to be changed to fixtures.pulpproject. I've updated the description and title to give more information about these changes.

@swadeley
Copy link
Contributor

swadeley commented Jul 6, 2020

@Griffin-Sullivan , can you search for a test that has the additional repos you just added and then run that test? Or perhaps the tests you ran before also cover those additional repos? If so, just run them again.

Thank you

@Griffin-Sullivan
Copy link
Contributor Author

@swadeley the "6 passed in 936.83 seconds" in the description are the tests that are affected by the new constants I added to this PR. Should I run those again and the tests I did before?

@latran
Copy link
Contributor

latran commented Jul 6, 2020

@Griffin-Sullivan, you can add the test_contentmanagement.py back in as part of this PR.

@Griffin-Sullivan
Copy link
Contributor Author

@latran I'm pretty sure the constant that affected test_contentmanagement.py is still a part of this PR. The specific repo was FAKE_7_YUM_REPO

@swadeley
Copy link
Contributor

swadeley commented Jul 6, 2020

@swadeley the "6 passed in 936.83 seconds" in the description are the tests that are affected by the new constants I added to this PR. Should I run those again and the tests I did before?

that would be best, to run them all again, because its not easy for the reviewers to be sure what changed since you ran them last.

@swadeley
Copy link
Contributor

swadeley commented Jul 6, 2020

@latran I'm pretty sure the constant that affected test_contentmanagement.py is still a part of this PR. The specific repo was FAKE_7_YUM_REPO

I only see robottelo/constants.py under the "Files changed" tab.

Edit: but in the commits I can see it, strange. On your system, do you still have two commits in your branch called Griffin-Sullivan:drpm-srpm ?

@Griffin-Sullivan
Copy link
Contributor Author

@swadeley Ok I'll run them all again. Also the only thing that ever affected test_contentmanagement.py was the FAKE_7_YUM_REPO in constants.py. I never made any changes to the actual test_contentmanagement.py file.

@daviddavis
Copy link

This looks good to me although I'd probably squash the two commits together.

Copy link
Member

@JacobCallahan JacobCallahan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

@JacobCallahan JacobCallahan merged commit 4d61966 into SatelliteQE:master Jul 27, 2020
@Griffin-Sullivan Griffin-Sullivan deleted the drpm-srpm branch March 4, 2022 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants