diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2018-01-15 15:32:06 +0100 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2018-01-15 15:32:06 +0100 |
| commit | 18a771a761654e241ae8d1e85aa0c0a6164c5d27 (patch) | |
| tree | 3237ccd0a014d19c425953328b65eb12801be831 /integration-cli/docker_cli_inspect_test.go | |
| parent | dfedc9ef6214500526c29fbf9a46aca9cecbeb57 (diff) | |
| download | docker-18a771a761654e241ae8d1e85aa0c0a6164c5d27.tar.gz | |
Remove deprecated environment.DaemonPlatform()
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'integration-cli/docker_cli_inspect_test.go')
| -rw-r--r-- | integration-cli/docker_cli_inspect_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index 13eb2d38aa..bf2ee71e95 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/integration-cli/docker_cli_inspect_test.go @@ -61,7 +61,7 @@ func (s *DockerSuite) TestInspectStatus(c *check.C) { // Windows does not support pause/unpause on Windows Server Containers. // (RS1 does for Hyper-V Containers, but production CI is not setup for that) - if testEnv.DaemonPlatform() != "windows" { + if testEnv.OSType != "windows" { dockerCmd(c, "pause", out) inspectOut = inspectField(c, out, "State.Status") c.Assert(inspectOut, checker.Equals, "paused") @@ -206,7 +206,7 @@ func (s *DockerSuite) TestInspectContainerGraphDriver(c *check.C) { func (s *DockerSuite) TestInspectBindMountPoint(c *check.C) { modifier := ",z" prefix, slash := getPrefixAndSlashFromDaemonPlatform() - if testEnv.DaemonPlatform() == "windows" { + if testEnv.OSType == "windows" { modifier = "" // Linux creates the host directory if it doesn't exist. Windows does not. os.Mkdir(`c:\data`, os.ModeDir) @@ -229,7 +229,7 @@ func (s *DockerSuite) TestInspectBindMountPoint(c *check.C) { c.Assert(m.Driver, checker.Equals, "") c.Assert(m.Source, checker.Equals, prefix+slash+"data") c.Assert(m.Destination, checker.Equals, prefix+slash+"data") - if testEnv.DaemonPlatform() != "windows" { // Windows does not set mode + if testEnv.OSType != "windows" { // Windows does not set mode c.Assert(m.Mode, checker.Equals, "ro"+modifier) } c.Assert(m.RW, checker.Equals, false) |