kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #39602 from cpuguy83/env_from_client 

Add `FromClient` to test env execution
This commit is contained in:
Vincent Demeester 2019-07-25 10:34:47 +02:00 committed by GitHub
parent a9dc697fd2 1381956499
commit ecaf0b479f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/test/environment/environment.go
View File

@ -34,13 +34,18 @@ type PlatformDefaults struct {
}
// New creates a new Execution struct
// This is configured useing the env client (see client.FromEnv)
func New() (*Execution, error) {
client, err := client.NewClientWithOpts(client.FromEnv)
c, err := client.NewClientWithOpts(client.FromEnv)
if err != nil {
return nil, errors.Wrapf(err, "failed to create client")
}
return FromClient(c)
}
info, err := client.Info(context.Background())
// FromClient creates a new Execution environment from the passed in client
func FromClient(c *client.Client) (*Execution, error) {
info, err := c.Info(context.Background())
if err != nil {
return nil, errors.Wrapf(err, "failed to get info from daemon")
}
@ -48,7 +53,7 @@ func New() (*Execution, error) {
osType := getOSType(info)
return &Execution{
client: client,
client: c,
DaemonInfo: info,
OSType: osType,
PlatformDefaults: getPlatformDefaults(info, osType),