Don't use err when it's nil #1046
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
|
|
rfay
changed the title
rfay
force-pushed
the
20180813_testcommon_panic
branch
from
b373a16
to
912360a
Compare
pkg/appimport/appimport_test.go
Outdated
| assert.Equal(err.Error(), "is archive") | ||
| if err != nil { | ||
| assert.Equal(err.Error(), "is archive") | ||
| } |
There was a problem hiding this comment.
We'll want to wait until the import-files refactor PR is in and rebase this as the function signature for ValidateAsset has changed, it now returns a bool isArchive value and doesn't rely on the error value.
rfay
force-pushed
the
20180813_testcommon_panic
branch
from
912360a
to
9d2e270
Compare
|
Rebased this, think it does what it should. I did figure out that one test failure - there was a cached download for a tarball that should never have succeeded. Not sure how that happened, but cleaning up ~/.ddev/testcache/ fixed it I think. |
andrewfrench
approved these changes
Aug 14, 2018
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.
The Problem/Issue/Bug:
In a couple of our tests we occasionally get panics because we get a nil for err and then use err.Error(). We shouldn't use a nil err.
How this PR Solves The Problem:
This affects only tests, and only occasionally, so is a code-review.
See the fail/panic in https://buildkite.com/drud/ddev-macos/builds/489#6c3c127b-8d24-40f2-861e-9ea7704c07e3