diff options
author | Qiang Huang <h.huangqiang@huawei.com> | 2016-02-29 19:28:37 +0800 |
---|---|---|
committer | Qiang Huang <h.huangqiang@huawei.com> | 2016-02-29 19:28:37 +0800 |
commit | 53b0d62683ee798198c553353dc2106623a9259b (patch) | |
tree | 0772f738d8142428d9799459247c5f4138df3566 /runconfig/config_test.go | |
parent | 67a77934a436e9995a5322178db7cea56a9458dc (diff) | |
download | docker-53b0d62683ee798198c553353dc2106623a9259b.tar.gz |
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Diffstat (limited to 'runconfig/config_test.go')
-rw-r--r-- | runconfig/config_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runconfig/config_test.go b/runconfig/config_test.go index 35a6a0272a..5804b12d0e 100644 --- a/runconfig/config_test.go +++ b/runconfig/config_test.go @@ -16,7 +16,7 @@ import ( type f struct { file string - entrypoint *strslice.StrSlice + entrypoint strslice.StrSlice } func TestDecodeContainerConfig(t *testing.T) { @@ -29,14 +29,14 @@ func TestDecodeContainerConfig(t *testing.T) { if runtime.GOOS != "windows" { image = "ubuntu" fixtures = []f{ - {"fixtures/unix/container_config_1_14.json", strslice.New()}, - {"fixtures/unix/container_config_1_17.json", strslice.New("bash")}, - {"fixtures/unix/container_config_1_19.json", strslice.New("bash")}, + {"fixtures/unix/container_config_1_14.json", strslice.StrSlice{}}, + {"fixtures/unix/container_config_1_17.json", strslice.StrSlice{"bash"}}, + {"fixtures/unix/container_config_1_19.json", strslice.StrSlice{"bash"}}, } } else { image = "windows" fixtures = []f{ - {"fixtures/windows/container_config_1_19.json", strslice.New("cmd")}, + {"fixtures/windows/container_config_1_19.json", strslice.StrSlice{"cmd"}}, } } @@ -55,7 +55,7 @@ func TestDecodeContainerConfig(t *testing.T) { t.Fatalf("Expected %s image, found %s\n", image, c.Image) } - if c.Entrypoint.Len() != f.entrypoint.Len() { + if len(c.Entrypoint) != len(f.entrypoint) { t.Fatalf("Expected %v, found %v\n", f.entrypoint, c.Entrypoint) } |