beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add decodeContainerConfig test removed from docker/cli

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2017-08-29 14:32:59 -04:00
parent 385727588e
commit 06ecc04167
3 changed files with 244 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/testutil/helpers.go
View file

@ -7,7 +7,7 @@ import (
// ErrorContains checks that the error is not nil, and contains the expected
// substring.
func ErrorContains(t require.TestingT, err error, expectedError string) {
require.Error(t, err)
assert.Contains(t, err.Error(), expectedError)
func ErrorContains(t require.TestingT, err error, expectedError string, msgAndArgs ...interface{}) {
require.Error(t, err, msgAndArgs...)
assert.Contains(t, err.Error(), expectedError, msgAndArgs...)
}

12
runconfig/config.go
View file

@ -17,20 +17,12 @@ type ContainerDecoder struct{}
// DecodeConfig makes ContainerDecoder to implement httputils.ContainerDecoder
func (r ContainerDecoder) DecodeConfig(src io.Reader) (*container.Config, *container.HostConfig, *networktypes.NetworkingConfig, error) {
c, hc, nc, err := decodeContainerConfig(src)
if err != nil {
return nil, nil, nil, err
}
return c, hc, nc, nil
return decodeContainerConfig(src)
}
// DecodeHostConfig makes ContainerDecoder to implement httputils.ContainerDecoder
func (r ContainerDecoder) DecodeHostConfig(src io.Reader) (*container.HostConfig, error) {
hc, err := decodeHostConfig(src)
if err != nil {
return nil, err
}
return hc, nil
return decodeHostConfig(src)
}
// decodeContainerConfig decodes a json encoded config into a ContainerConfigWrapper

239
runconfig/config_test.go
View file

@ -9,9 +9,14 @@ import (
"strings"
"testing"
"os"
"github.com/docker/docker/api/types/container"
networktypes "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/strslice"
"github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
type f struct {
@ -137,3 +142,237 @@ func callDecodeContainerConfigIsolation(isolation string) (*container.Config, *c
}
return decodeContainerConfig(bytes.NewReader(b))
}
func TestDecodeContainerConfigWithVolumes(t *testing.T) {
var testcases = []decodeConfigTestcase{
{
doc: "no paths volume",
wrapper: containerWrapperWithVolume(":"),
expectedErr: `invalid volume specification: ':'`,
},
{
doc: "no paths bind",
wrapper: containerWrapperWithBind(":"),
expectedErr: `invalid volume specification: ':'`,
},
{
doc: "no paths or mode volume",
wrapper: containerWrapperWithVolume("::"),
expectedErr: `invalid volume specification: '::'`,
},
{
doc: "no paths or mode bind",
wrapper: containerWrapperWithBind("::"),
expectedErr: `invalid volume specification: '::'`,
},
}
for _, testcase := range testcases {
t.Run(testcase.doc, runDecodeContainerConfigTestCase(testcase))
}
}
func TestDecodeContainerConfigWithVolumesUnix(t *testing.T) {
skip.IfCondition(t, runtime.GOOS == "windows")
baseErr := `invalid mount config for type "volume": invalid specification: `
var testcases = []decodeConfigTestcase{
{
doc: "root to root volume",
wrapper: containerWrapperWithVolume("/:/"),
expectedErr: `invalid volume specification: '/:/'`,
},
{
doc: "root to root bind",
wrapper: containerWrapperWithBind("/:/"),
expectedErr: `invalid volume specification: '/:/'`,
},
{
doc: "no destination path volume",
wrapper: containerWrapperWithVolume(`/tmp:`),
expectedErr: ` invalid volume specification: '/tmp:'`,
},
{
doc: "no destination path bind",
wrapper: containerWrapperWithBind(`/tmp:`),
expectedErr: ` invalid volume specification: '/tmp:'`,
},
{
doc: "no destination path or mode volume",
wrapper: containerWrapperWithVolume(`/tmp::`),
expectedErr: `invalid mount config for type "bind": field Target must not be empty`,
},
{
doc: "no destination path or mode bind",
wrapper: containerWrapperWithBind(`/tmp::`),
expectedErr: `invalid mount config for type "bind": field Target must not be empty`,
},
{
doc: "too many sections volume",
wrapper: containerWrapperWithVolume(`/tmp:/tmp:/tmp:/tmp`),
expectedErr: `invalid volume specification: '/tmp:/tmp:/tmp:/tmp'`,
},
{
doc: "too many sections bind",
wrapper: containerWrapperWithBind(`/tmp:/tmp:/tmp:/tmp`),
expectedErr: `invalid volume specification: '/tmp:/tmp:/tmp:/tmp'`,
},
{
doc: "just root volume",
wrapper: containerWrapperWithVolume("/"),
expectedErr: baseErr + `destination can't be '/'`,
},
{
doc: "just root bind",
wrapper: containerWrapperWithBind("/"),
expectedErr: baseErr + `destination can't be '/'`,
},
{
doc: "bind mount passed as a volume",
wrapper: containerWrapperWithVolume(`/foo:/bar`),
expectedConfig: &container.Config{
Volumes: map[string]struct{}{`/foo:/bar`: {}},
},
expectedHostConfig: &container.HostConfig{NetworkMode: "default"},
},
}
for _, testcase := range testcases {
t.Run(testcase.doc, runDecodeContainerConfigTestCase(testcase))
}
}
type decodeConfigTestcase struct {
doc string
wrapper ContainerConfigWrapper
expectedErr string
expectedConfig *container.Config
expectedHostConfig *container.HostConfig
goos string
}
func runDecodeContainerConfigTestCase(testcase decodeConfigTestcase) func(t *testing.T) {
return func(t *testing.T) {
raw := marshal(t, testcase.wrapper, testcase.doc)
config, hostConfig, _, err := decodeContainerConfig(bytes.NewReader(raw))
if testcase.expectedErr != "" {
if !assert.Error(t, err) {
return
}
assert.Contains(t, err.Error(), testcase.expectedErr)
return
}
assert.NoError(t, err)
assert.Equal(t, testcase.expectedConfig, config)
assert.Equal(t, testcase.expectedHostConfig, hostConfig)
}
}
func TestDecodeContainerConfigWithVolumesWindows(t *testing.T) {
skip.IfCondition(t, runtime.GOOS != "windows")
tmpDir := os.Getenv("TEMP")
systemDrive := os.Getenv("SystemDrive")
var testcases = []decodeConfigTestcase{
{
doc: "root to root volume",
wrapper: containerWrapperWithVolume(systemDrive + `\:c:\`),
expectedErr: `invalid volume specification: `,
},
{
doc: "root to root bind",
wrapper: containerWrapperWithBind(systemDrive + `\:c:\`),
expectedErr: `invalid volume specification: `,
},
{
doc: "no destination path volume",
wrapper: containerWrapperWithVolume(tmpDir + `\:`),
expectedErr: `invalid volume specification: `,
},
{
doc: "no destination path bind",
wrapper: containerWrapperWithBind(tmpDir + `\:`),
expectedErr: `invalid volume specification: `,
},
{
doc: "no destination path or mode volume",
wrapper: containerWrapperWithVolume(tmpDir + `\::`),
expectedErr: `invalid volume specification: `,
},
{
doc: "no destination path or mode bind",
wrapper: containerWrapperWithBind(tmpDir + `\::`),
expectedErr: `invalid volume specification: `,
},
{
doc: "too many sections volume",
wrapper: containerWrapperWithVolume(tmpDir + ":" + tmpDir + ":" + tmpDir + ":" + tmpDir),
expectedErr: `invalid volume specification: `,
},
{
doc: "too many sections bind",
wrapper: containerWrapperWithBind(tmpDir + ":" + tmpDir + ":" + tmpDir + ":" + tmpDir),
expectedErr: `invalid volume specification: `,
},
{
doc: "no drive letter volume",
wrapper: containerWrapperWithVolume(`\tmp`),
expectedErr: `invalid volume specification: `,
},
{
doc: "no drive letter bind",
wrapper: containerWrapperWithBind(`\tmp`),
expectedErr: `invalid volume specification: `,
},
{
doc: "root to c-drive volume",
wrapper: containerWrapperWithVolume(systemDrive + `\:c:`),
expectedErr: `invalid volume specification: `,
},
{
doc: "root to c-drive bind",
wrapper: containerWrapperWithBind(systemDrive + `\:c:`),
expectedErr: `invalid volume specification: `,
},
{
doc: "container path without driver letter volume",
wrapper: containerWrapperWithVolume(`c:\windows:\somewhere`),
expectedErr: `invalid volume specification: `,
},
{
doc: "container path without driver letter bind",
wrapper: containerWrapperWithBind(`c:\windows:\somewhere`),
expectedErr: `invalid volume specification: `,
},
}
for _, testcase := range testcases {
t.Run(testcase.doc, runDecodeContainerConfigTestCase(testcase))
}
}
func marshal(t *testing.T, w ContainerConfigWrapper, doc string) []byte {
b, err := json.Marshal(w)
require.NoError(t, err, "%s: failed to encode config wrapper", doc)
return b
}
func containerWrapperWithVolume(volume string) ContainerConfigWrapper {
return ContainerConfigWrapper{
Config: &container.Config{
Volumes: map[string]struct{}{
volume: {},
},
},
HostConfig: &container.HostConfig{},
}
}
func containerWrapperWithBind(bind string) ContainerConfigWrapper {
return ContainerConfigWrapper{
Config: &container.Config{
Volumes: map[string]struct{}{},
},
HostConfig: &container.HostConfig{
Binds: []string{bind},
},
}
}