github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an e2e test for exec liveness probes. Fix the docker exec integration.

Browse Source
This commit is contained in:
Brendan Burns
2014-12-16 13:06:58 -08:00
parent 56ee66831b
commit 3a0d16ff35
4 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/dockertools/docker_test.go
View File

@@ -130,7 +130,7 @@ func TestGetDockerServerVersion(t *testing.T) {
if err != nil {
t.Errorf("got error while getting docker server version - %s", err)
}
expectedVersion := []uint{1, 1, 3}
expectedVersion := []uint{1, 15}
if len(expectedVersion) != len(version) {
t.Errorf("invalid docker server version. expected: %v, got: %v", expectedVersion, version)
} else {
@@ -155,7 +155,7 @@ func TestExecSupportExists(t *testing.T) {
}
func TestExecSupportNotExists(t *testing.T) {
fakeDocker := &FakeDockerClient{VersionInfo: docker.Env{"Client version=1.2", "Server version=1.1.2", "Server API version=1.15"}}
fakeDocker := &FakeDockerClient{VersionInfo: docker.Env{"Client version=1.2", "Server version=1.1.2", "Server API version=1.14"}}
runner := dockerContainerCommandRunner{fakeDocker}
useNativeExec, _ := runner.nativeExecSupportExists()
if useNativeExec {