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

[RHELC-67] Add gnome-documents-libs to excluded packages #554

Merged
merged 3 commits into from
Aug 10, 2022

Conversation

r0x0d
Copy link
Member

@r0x0d r0x0d commented Aug 3, 2022

The gnome-documents-libs package is causing file conflicts with gnome-documents
during the package transaction as they both share similar files.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2043724

Signed-off-by: Rodolfo Olivieri [email protected]

@r0x0d r0x0d self-assigned this Aug 3, 2022
@r0x0d
Copy link
Member Author

r0x0d commented Aug 3, 2022

This has been tested under CentOS 7.9 and Oracle Linux 7.9

@r0x0d r0x0d requested a review from bocekm August 3, 2022 19:13
@codecov
Copy link

codecov bot commented Aug 3, 2022

Codecov Report

Merging #554 (6a385d8) into main (121fa76) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #554   +/-   ##
=======================================
  Coverage   89.26%   89.26%           
=======================================
  Files          17       17           
  Lines        2469     2469           
  Branches      427      427           
=======================================
  Hits         2204     2204           
  Misses        203      203           
  Partials       62       62           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@danmyway danmyway requested review from mkluson and kokesak August 4, 2022 13:43
@r0x0d
Copy link
Member Author

r0x0d commented Aug 4, 2022

Thanks for adding the integration tests, @danmyway

@danmyway
Copy link
Member

danmyway commented Aug 4, 2022

Thanks for adding the integration tests, @danmyway

Pleasure, @r0x0d

def test_remove_excluded_pkgs_centos8(shell, convert2rhel):
"""Ensure c2r removes pkgs, which specified as excluded_pkgs in config."""

excluded_pkg_1 = "gnome-documents-libs"
Copy link
Member

Choose a reason for hiding this comment

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

Is this the only difference from test_remove_excluded_pkgs_epel7.py? If yes, can we have just one test but parametrized?

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

@r0x0d was the removal of integration test intended?

Copy link
Member

Choose a reason for hiding this comment

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

@danmyway mentioned today he still works on the improving the integration test.

Copy link
Member

Choose a reason for hiding this comment

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

Test updated

The gnome-documents-libs package is causing file conflicts with gnome-documents
during the package transaction as they both share similar files.

Signed-off-by: Rodolfo Olivieri <[email protected]>
@r0x0d r0x0d force-pushed the solve-gnome-document-libs-conflict branch from c425db0 to 7ec6727 Compare August 5, 2022 13:58
bocekm
bocekm previously approved these changes Aug 5, 2022
* set checked excluded packages as an environment variable
* create two test plans for each epel7 and epel8 runs
* agregate previously created two tests into one parametrized
* edit docstring
@danmyway
Copy link
Member

danmyway commented Aug 9, 2022

/packit build

@r0x0d
Copy link
Member Author

r0x0d commented Aug 9, 2022

@danmyway my savior! Thanks for adding them back.

* assert `returncode != 0` rather than `returncode == 1` for cases where
  more than one package is checked by rpm query
@danmyway
Copy link
Member

danmyway commented Aug 9, 2022

The test was failing because of a bad assertion of shell return code.
Fixed by 6a385d8

Copy link
Member

@kokesak kokesak left a comment

Choose a reason for hiding this comment

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

Looks nice. Good job @danmyway

@kokesak kokesak merged commit 65896f1 into oamg:main Aug 10, 2022
@bocekm bocekm mentioned this pull request Aug 19, 2022
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.

6 participants