fixes #19063 - uploads packages with correct name #6813
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
houndci-bot
reviewed
Jun 6, 2017
| @@ -850,6 +850,37 @@ def test_import_uploads | |||
| assert_response :success | |||
| end | |||
|
|
|||
| def test_import_uploads | |||
There was a problem hiding this comment.
Method Katello::Api::V2::RepositoriesControllerTest#test_import_uploads is defined at both test/controllers/api/v2/repositories_controller_test.rb:840 and test/controllers/api/v2/repositories_controller_test.rb:853.
| upload.except('id').except('name') | ||
| else | ||
| upload.except('id') | ||
| end | ||
| end | ||
|
|
||
|
|
| @@ -365,13 +366,14 @@ def import_uploads | |||
|
|
|||
| upload_ids = uploads.map { |upload| upload['id'] } | |||
| unit_keys = uploads.map do |upload| | |||
| if @repository.file? | |||
| unless @repository.file? | |||
There was a problem hiding this comment.
Do not use unless with else. Rewrite these with the positive case first.
parthaa
force-pushed
the
package-upload
branch
2 times, most recently
from
dc51ecc
to
e463548
Compare
This commit fixes an issue with the package uploads The prior logic includes the package name for yum repos while excludes the name for file repos. What we intend to happen is the reverse. We need to include the name for file but exclude for yum since the name is derived from the metadata for yum, puppet and other types. This commit also contains a couple of unit tests to handle this.
|
package uploaded with on master on PR branch The name is corrected by this change 👍 |
johnpmitsch
approved these changes
Jun 9, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes an issue with the package uploads
The prior logic includes the package name for yum repos
while excludes the name for file repos. What we intend to
happen is the reverse. We need to include the name for file
but exclude for yum since the name is derived from the metadata
for yum, puppet and other types.
This commit also contains a couple of unit tests to handle this.