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

refactor e2e_node conformance test

Browse Source 
Signed-off-by: liang chenye <liangchenye@huawei.com>
This commit is contained in:
liang chenye
2016-04-23 10:50:02 +08:00
parent 945daaae91
commit aa3bf1faac
6 changed files with 309 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e_node/container.go
View File

@@ -21,6 +21,7 @@ import (
"fmt"
"k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors"
client "k8s.io/kubernetes/pkg/client/unversioned"
"github.com/onsi/gomega/format"
@@ -100,5 +101,15 @@ func (cc *ConformanceContainer) Get() (ConformanceContainer, error) {
if containers == nil || len(containers) != 1 {
return ConformanceContainer{}, errors.New("Failed to get container")
}
return ConformanceContainer{containers[0], cc.Client, pod.Status.Phase, cc.NodeName}, nil
return ConformanceContainer{containers[0], cc.Client, pod.Status.Phase, pod.Spec.NodeName}, nil
}
func (cc *ConformanceContainer) Present() (bool, error) {
_, err := cc.Client.Pods(api.NamespaceDefault).Get(cc.Container.Name)
if err == nil {
return true, nil
} else if err != nil && apierrs.IsNotFound(err) {
return false, nil
}
return false, err
}