scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Generate valid container id in fake docker client."

Browse Source
This commit is contained in:
Jordan Liggitt
2017-02-18 10:06:24 -05:00
committed by GitHub
parent ff12e5688c
commit 66dec96735
8 changed files with 185 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/kubelet/dockershim/docker_container_test.go
View File

@@ -24,7 +24,6 @@ import (
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
@@ -243,20 +242,23 @@ func TestContainerCreationConflict(t *testing.T) {
expectFields: 6,
},
"random create error": {
createError: randomError,
expectError: randomError,
expectCalls: []string{"create"},
createError: randomError,
expectError: randomError,
expectCalls: []string{"create"},
expectFields: 1,
},
"conflict create error with successful remove": {
createError: conflictError,
expectError: conflictError,
expectCalls: []string{"create", "remove"},
createError: conflictError,
expectError: conflictError,
expectCalls: []string{"create", "remove"},
expectFields: 1,
},
"conflict create error with random remove error": {
createError: conflictError,
removeError: randomError,
expectError: conflictError,
expectCalls: []string{"create", "remove"},
createError: conflictError,
removeError: randomError,
expectError: conflictError,
expectCalls: []string{"create", "remove"},
expectFields: 1,
},
"conflict create error with no such container remove error": {
createError: conflictError,
@@ -274,13 +276,9 @@ func TestContainerCreationConflict(t *testing.T) {
if test.removeError != nil {
fDocker.InjectError("remove", test.removeError)
}
id, err := ds.CreateContainer(sandboxId, config, sConfig)
require.Equal(t, test.expectError, err)
name, err := ds.CreateContainer(sandboxId, config, sConfig)
assert.Equal(t, test.expectError, err)
assert.NoError(t, fDocker.AssertCalls(test.expectCalls))
if err == nil {
c, err := fDocker.InspectContainer(id)
assert.NoError(t, err)
assert.Len(t, strings.Split(c.Name, nameDelimiter), test.expectFields)
}
assert.Len(t, strings.Split(name, nameDelimiter), test.expectFields)
}
}