Fix source file merge #272
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
* Instead of checking for len of coverage, merge file only when blob id matches`
codeclimate-hermes
requested review from
larkinscott
and removed request for
codeclimate-hermes
wfleming
approved these changes
Dec 12, 2017
| @@ -47,3 +47,11 @@ func (c *Coverage) UnmarshalJSON(text []byte) error { | |||
| *c = cc | |||
| return nil | |||
| } | |||
|
|
|||
| func (c *Coverage) AppendNulls(quantity int) Coverage { | |||
There was a problem hiding this comment.
Nice, I'd seen this basic pattern a bunch of places, we can probably use it across a bunch of formatters later!
formatters/report_test.go
Outdated
| @@ -35,6 +35,7 @@ func Test_Report_Merge_MismatchedCoverageLength(t *testing.T) { | |||
| SourceFiles: SourceFiles{ | |||
| "a.go": { | |||
| Name: "a.go", | |||
| BlobID: "a", | |||
There was a problem hiding this comment.
💄 Looks to me like you need to run go fmt?
formatters/source_file.go
Outdated
| if len(a.Coverage) != len(b.Coverage) { | ||
| return a, errors.Errorf("coverage length mismatch for %s", a.Name) | ||
| if a.BlobID != b.BlobID { | ||
| return a, errors.Errorf("Failed to merge coverage for source file %s. BlobID mismatch", a.Name) |
There was a problem hiding this comment.
It's a little odd to treat the first part as a proper sentence with a period but the end of the message is a sentence fragment without punctuation. Can we use : instead of . so the message is more similar in grammatical structure to other messages?
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.
when blob id matches