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.

Sign up for GitHub

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

Jump to bottom

Add coverage for BZ#2092039 and update few docstrings #13187

Merged
merged 2 commits into from
Nov 30, 2023
Merged

Add coverage for BZ#2092039 and update few docstrings #13187

merged 2 commits into from
Nov 30, 2023

Conversation

vsedmik
Copy link
Contributor

@vsedmik vsedmik commented Nov 24, 2023

Problem Statement

Coverage for BZ#2092039 is missing.

Solution

This PR. Also adds few docstring fixes.

@vsedmik vsedmik added CLI Issues and PRs involving the CLI QETestCoverage Issues and PRs relating to a Satellite bug CherryPick PR needs CherryPick to previous branches 6.12.z Introduced in or relating directly to Satellite 6.12 6.13.z Introduced in or relating directly to Satellite 6.13 6.14.z Introduced in or relating directly to Satellite 6.14 labels Nov 24, 2023
@vsedmik vsedmik self-assigned this Nov 24, 2023
@vsedmik vsedmik requested a review from a team as a code owner November 24, 2023 14:41
@vsedmik
Copy link
Contributor Author

vsedmik commented Nov 24, 2023

trigger: test-robottelo
pytest: tests/foreman/cli/test_satellitesync.py -k mismatch

@Gauravtalreja1 Gauravtalreja1 added the 6.15.z Introduced in or relating directly to Satellite 6.15 label Nov 28, 2023
Griffin-Sullivan
Griffin-Sullivan approved these changes Nov 28, 2023
View reviewed changes
Copy link
Contributor

@Griffin-Sullivan Griffin-Sullivan left a comment

Choose a reason for hiding this comment

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

I appreciate all of the docstring updates. Makes it much cleaner. Just one question about the timeout for both imports. Otherwise this is ready to merge.

tests/foreman/cli/test_satellitesync.py Outdated
import_path = target_sat.move_pulp_archive(function_sca_manifest_org, export['message'])
target_sat.cli.ContentImport.repository(
{'organization-id': function_import_org_with_manifest.id, 'path': import_path},
timeout=300000,
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this a 300000 second timeout? If so, I think we should turn it down.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should be in miliseconds I guess (at least from what I can see elsewhere grepping for \.cli\..*timeout)

Copy link
Contributor

Choose a reason for hiding this comment

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

I followed the steps to here https://github.com/SatelliteQE/broker/blob/master/broker/hosts.py#L139. It's possible VS Code led me astray, so I'll double check.

Copy link
Contributor

Choose a reason for hiding this comment

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

Might be good to tag @JacobCallahan here for confirmation.

Copy link
Member

Choose a reason for hiding this comment

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

@Griffin-Sullivan is correct, that timeout is in seconds. In fact, Broker also allows you to use more clear timeout formatting so instead of specifying a long timeout like that, you can just pass timeout="5m"
https://github.com/SatelliteQE/broker/blob/master/broker/session.py#L99
https://github.com/SatelliteQE/broker/blob/master/broker/helpers.py#L417

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, changed to the nicer format, let's wait for the PRT.

lhellebr
lhellebr reviewed Nov 29, 2023
View reviewed changes
Copy link
Contributor

@lhellebr lhellebr left a comment

Choose a reason for hiding this comment

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

LGTM pending my comment and the timeout uncertainity.

tests/foreman/cli/test_satellitesync.py Show resolved Hide resolved
@vsedmik
Copy link
Contributor Author

vsedmik commented Nov 29, 2023

trigger: test-robottelo
pytest: tests/foreman/cli/test_satellitesync.py -k mismatch

@pondrejk pondrejk merged commit b0c9d57 into SatelliteQE:master Nov 30, 2023
6 checks passed
@pondrejk pondrejk added the AutoMerge_Cherry_Picked The cherrypicked PRs of master PR would be automerged if all checks passing label Nov 30, 2023
This was referenced Nov 30, 2023
Closed
Closed
Closed
Closed
This was referenced Dec 1, 2023
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Griffin-Sullivan Griffin-Sullivan Griffin-Sullivan approved these changes

@JacobCallahan JacobCallahan JacobCallahan left review comments

@synkd synkd synkd approved these changes

@pondrejk pondrejk pondrejk approved these changes

@lhellebr lhellebr lhellebr approved these changes

Assignees

@vsedmik vsedmik

Labels
6.12.z Introduced in or relating directly to Satellite 6.12 6.13.z Introduced in or relating directly to Satellite 6.13 6.14.z Introduced in or relating directly to Satellite 6.14 6.15.z Introduced in or relating directly to Satellite 6.15 AutoMerge_Cherry_Picked The cherrypicked PRs of master PR would be automerged if all checks passing CherryPick PR needs CherryPick to previous branches CLI Issues and PRs involving the CLI QETestCoverage Issues and PRs relating to a Satellite bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@vsedmik @JacobCallahan @lhellebr @pondrejk @synkd @Griffin-Sullivan @Gauravtalreja1