kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Break out non-Windows sys/mount usage into helper

Browse source 
Rather than bifurcate the test completely, this lets us keep the test
intact with a small function wrapper to allow the compiler to build the
code that'll never be called on Windows, on Windows.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
This commit is contained in:
Paul "TBBle" Hampson 2020-11-06 01:23:49 +11:00
parent 3e3f3d7168
commit 7bb729e928
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
integration-cli/docker_api_containers_test.go
View file

@ -30,7 +30,6 @@ import (
"github.com/docker/docker/testutil/request" "github.com/docker/docker/testutil/request"
"github.com/docker/docker/volume" "github.com/docker/docker/volume"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/moby/sys/mount"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/poll" "gotest.tools/v3/poll"
@ -2056,7 +2055,7 @@ func (s *DockerSuite) TestContainersAPICreateMountsCreate(c *testing.T) {
assert.NilError(c, err) assert.NilError(c, err)
defer os.RemoveAll(tmpDir3) defer os.RemoveAll(tmpDir3)
assert.Assert(c, mount.Mount(tmpDir3, tmpDir3, "none", "bind,shared") == nil) assert.Assert(c, mountWrapper(tmpDir3, tmpDir3, "none", "bind,shared") == nil)
cases = append(cases, []testCase{ cases = append(cases, []testCase{
{ {

9
integration-cli/docker_api_containers_unix_test.go Normal file
View file

@ -0,0 +1,9 @@
// +build !windows
package main
import "github.com/moby/sys/mount"
func mountWrapper(device, target, mType, options string) error {
return mount.Mount(device, target, mType, options)
}

6
integration-cli/docker_api_containers_windows_test.go
View file

@ -15,6 +15,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/mount"
"github.com/pkg/errors"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
@ -75,3 +76,8 @@ func (s *DockerSuite) TestContainersAPICreateMountsBindNamedPipe(c *testing.T) {
assert.NilError(c, err) assert.NilError(c, err)
assert.Check(c, is.Equal(text, strings.TrimSpace(string(b)))) assert.Check(c, is.Equal(text, strings.TrimSpace(string(b))))
} }
func mountWrapper(device, target, mType, options string) error {
// This should never be called.
return errors.Errorf("there is no implementation of Mount on this platform")
}