Merge pull request #20415 from liangchenye/e2etest

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-29 07:34:05 -08:00
2 changed files with 225 additions and 0 deletions

View File

@@ -0,0 +1,121 @@
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e_node
import (
"time"
"k8s.io/kubernetes/pkg/api"
client "k8s.io/kubernetes/pkg/client/unversioned"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
const (
serviceCreateTimeout = 2 * time.Minute
)
var _ = Describe("Container Conformance Test", func() {
var cl *client.Client
BeforeEach(func() {
// Setup the apiserver client
cl = client.NewOrDie(&client.Config{Host: *apiServerAddress})
})
Describe("container conformance blackbox test", func() {
Context("when running a container that terminates", func() {
var terminateCase ConformanceContainer
BeforeEach(func() {
terminateCase = ConformanceContainer{
Container: api.Container{
Image: "gcr.io/google_containers/busybox:1.24",
Name: "busybox",
Command: []string{"sh", "-c", "env"},
ImagePullPolicy: api.PullIfNotPresent,
},
Client: cl,
Phase: api.PodSucceeded,
NodeName: *nodeName,
}
})
It("it should start successfully [Conformance]", func() {
err := terminateCase.Create()
Expect(err).NotTo(HaveOccurred())
phase := api.PodPending
for start := time.Now(); time.Since(start) < serviceCreateTimeout; time.Sleep(time.Second * 30) {
ccontainer, err := terminateCase.Get()
if err != nil || ccontainer.Phase != api.PodPending {
phase = ccontainer.Phase
break
}
}
Expect(phase).Should(Equal(terminateCase.Phase))
})
It("it should report its phase as 'succeeded' [Conformance]", func() {
ccontainer, err := terminateCase.Get()
Expect(err).NotTo(HaveOccurred())
Expect(ccontainer).Should(CContainerEqual(terminateCase))
})
It("it should be possible to delete [Conformance]", func() {
err := terminateCase.Delete()
Expect(err).NotTo(HaveOccurred())
})
})
Context("when running a container with invalid image", func() {
var invalidImageCase ConformanceContainer
BeforeEach(func() {
invalidImageCase = ConformanceContainer{
Container: api.Container{
Image: "foo.com/foo/foo",
Name: "foo",
Command: []string{"foo", "'Should not work'"},
ImagePullPolicy: api.PullIfNotPresent,
},
Client: cl,
Phase: api.PodPending,
NodeName: *nodeName,
}
})
It("it should not start successfully [Conformance]", func() {
err := invalidImageCase.Create()
Expect(err).NotTo(HaveOccurred())
phase := api.PodPending
for start := time.Now(); time.Since(start) < serviceCreateTimeout; time.Sleep(time.Second * 30) {
ccontainer, err := invalidImageCase.Get()
if err != nil || ccontainer.Phase != api.PodPending {
phase = ccontainer.Phase
break
}
}
Expect(phase).Should(Equal(invalidImageCase.Phase))
})
It("it should report its phase as 'pending' [Conformance]", func() {
ccontainer, err := invalidImageCase.Get()
Expect(err).NotTo(HaveOccurred())
Expect(ccontainer).Should(CContainerEqual(invalidImageCase))
})
It("it should be possible to delete [Conformance]", func() {
err := invalidImageCase.Delete()
Expect(err).NotTo(HaveOccurred())
})
})
})
})

104
test/e2e_node/container.go Normal file
View File

@@ -0,0 +1,104 @@
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e_node
import (
"errors"
"fmt"
"k8s.io/kubernetes/pkg/api"
client "k8s.io/kubernetes/pkg/client/unversioned"
"github.com/onsi/gomega/format"
"github.com/onsi/gomega/types"
)
//One pod one container
type ConformanceContainer struct {
Container api.Container
Client *client.Client
Phase api.PodPhase
NodeName string
}
type ConformanceContainerEqualMatcher struct {
Expected interface{}
}
func CContainerEqual(expected interface{}) types.GomegaMatcher {
return &ConformanceContainerEqualMatcher{
Expected: expected,
}
}
func (matcher *ConformanceContainerEqualMatcher) Match(actual interface{}) (bool, error) {
if actual == nil && matcher.Expected == nil {
return false, fmt.Errorf("Refusing to compare <nil> to <nil>.\nBe explicit and use BeNil() instead. This is to avoid mistakes where both sides of an assertion are erroneously uninitialized.")
}
val := api.Semantic.DeepDerivative(matcher.Expected, actual)
return val, nil
}
func (matcher *ConformanceContainerEqualMatcher) FailureMessage(actual interface{}) (message string) {
return format.Message(actual, "to equal", matcher.Expected)
}
func (matcher *ConformanceContainerEqualMatcher) NegatedFailureMessage(actual interface{}) (message string) {
return format.Message(actual, "not to equal", matcher.Expected)
}
func (cc *ConformanceContainer) Create() error {
pod := &api.Pod{
ObjectMeta: api.ObjectMeta{
//Same with the container name
Name: cc.Container.Name,
Namespace: api.NamespaceDefault,
},
Spec: api.PodSpec{
NodeName: cc.NodeName,
RestartPolicy: api.RestartPolicyNever,
Containers: []api.Container{
cc.Container,
},
},
}
_, err := cc.Client.Pods(api.NamespaceDefault).Create(pod)
return err
}
//Same with 'delete'
func (cc *ConformanceContainer) Stop() error {
return cc.Client.Pods(api.NamespaceDefault).Delete(cc.Container.Name, &api.DeleteOptions{})
}
func (cc *ConformanceContainer) Delete() error {
return cc.Client.Pods(api.NamespaceDefault).Delete(cc.Container.Name, &api.DeleteOptions{})
}
func (cc *ConformanceContainer) Get() (ConformanceContainer, error) {
pod, err := cc.Client.Pods(api.NamespaceDefault).Get(cc.Container.Name)
if err != nil {
return ConformanceContainer{}, err
}
containers := pod.Spec.Containers
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
}