Completely remove deprecated d.NewClient from testing tools#38686
Merged
thaJeztah merged 1 commit intomoby:masterfrom Feb 21, 2019
Merged
Completely remove deprecated d.NewClient from testing tools#38686thaJeztah merged 1 commit intomoby:masterfrom
d.NewClient from testing tools#38686thaJeztah merged 1 commit intomoby:masterfrom
Conversation
Member
|
oh, hm.. looks like this needs some changes; |
thaJeztah
added
status/2-code-review
status/failing-ci
cpuguy83
force-pushed
the
remove_deprecated_newclient
branch
from
612dc96 to
4ffbed5
Compare
Member
Author
|
Oops. Pushed an update to fix. |
cpuguy83
force-pushed
the
remove_deprecated_newclient
branch
from
4ffbed5 to
820d710
Compare
thaJeztah
removed
the
status/failing-ci
Favor `d.NewClientT` instead. Signed-off-by: Brian Goff <[email protected]>
cpuguy83
force-pushed
the
remove_deprecated_newclient
branch
from
820d710 to
e063099
Compare
Codecov Report
@@ Coverage Diff @@
## master #38686 +/- ##
==========================================
- Coverage 36.56% 36.53% -0.03%
==========================================
Files 610 610
Lines 45395 45395
==========================================
- Hits 16598 16587 -11
- Misses 26505 26510 +5
- Partials 2292 2298 +6 |
Member
Author
|
Ok, all green. Want to double-check? |
thaJeztah
reviewed
Feb 8, 2019
Member
thaJeztah
left a comment
thaJeztah
left a comment
There was a problem hiding this comment.
left one question that I wasn't entirely sure of, but otherwise still looks sane to me
| return f(c, t) | ||
| func withClient(t assert.TestingT, d *Daemon, f func(client.APIClient, poll.LogT) poll.Result) func(poll.LogT) poll.Result { | ||
| return func(pt poll.LogT) poll.Result { | ||
| c := d.NewClientT(t) |
Member
There was a problem hiding this comment.
Wondering if there's a need to use poll.Error here? In that case perhaps we should inline ~ what NewClientT does here
Suggested change
| c := d.NewClientT(t) | |
| if ht, ok := t.(test.HelperT); ok { | |
| ht.Helper() | |
| } | |
| c, err := client.NewClientWithOpts( | |
| client.FromEnv, | |
| client.WithHost(d.Sock())) | |
| if err != nil { | |
| poll.Error(err) | |
| } |
Member
There was a problem hiding this comment.
NewClientT will mark the build as fail (and fatal), so I'm pretty sure it will get out of the poll loop in case of failure… but I'm not 100% sure about that.
cc @dnephin
Member
There was a problem hiding this comment.
Ya, that sounds right. t.Fatal will panic and stop execution.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Favor
d.NewClientTinstead.