InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add FromClient to test env execution

Browse Source 
While working on other tests I noticed that environment.Execution cannot
be used for anything but the pre-configured daemon, however this can
come in handy for being able share daemons across multiple tests that
currently spin up a new daemon.
The execution env also seems to be misused in some of these cases.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 1381956499)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Brian Goff
2019-07-24 11:32:05 -07:00
committed by Sebastiaan van Stijn
parent 6949793bb1
commit b813c398bb
1 changed files with 8 additions and 3 deletions
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 // New creates a new Execution struct
// This is configured useing the env client (see client.FromEnv)
func New() (*Execution, error) { func New() (*Execution, error) {
client, err := client.NewClientWithOpts(client.FromEnv) c, err := client.NewClientWithOpts(client.FromEnv)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "failed to create client") 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 { if err != nil {
return nil, errors.Wrapf(err, "failed to get info from daemon") return nil, errors.Wrapf(err, "failed to get info from daemon")
} }
@@ -48,7 +53,7 @@ func New() (*Execution, error) {
osType := getOSType(info) osType := getOSType(info)
return &Execution{ return &Execution{
client: client, client: c,
DaemonInfo: info, DaemonInfo: info,
OSType: osType, OSType: osType,
PlatformDefaults: getPlatformDefaults(info, osType), PlatformDefaults: getPlatformDefaults(info, osType),