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

Fix kubectl e2e test

Browse Source
This commit is contained in:
gmarek 2015-05-15 11:39:30 +02:00
parent f57f317830
commit d65f67a4d1
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/kubectl.go
View File

@ -72,7 +72,7 @@ var _ = Describe("kubectl", func() {
)
It("should create and stop a replication controller", func() {
defer cleanup(nautilusPath, updateDemoSelector)
defer cleanup(nautilusPath, ns, updateDemoSelector)
By("creating a replication controller")
runKubectl("create", "-f", nautilusPath, fmt.Sprintf("--namespace=%v", ns))
@ -80,7 +80,7 @@ var _ = Describe("kubectl", func() {
})
It("should scale a replication controller", func() {
defer cleanup(nautilusPath, updateDemoSelector)
defer cleanup(nautilusPath, ns, updateDemoSelector)
By("creating a replication controller")
runKubectl("create", "-f", nautilusPath, fmt.Sprintf("--namespace=%v", ns))
@ -95,7 +95,7 @@ var _ = Describe("kubectl", func() {
It("should do a rolling update of a replication controller", func() {
// Cleanup all resources in case we fail somewhere in the middle
defer cleanup(updateDemoRoot, updateDemoSelector)
defer cleanup(updateDemoRoot, ns, updateDemoSelector)
By("creating the initial replication controller")
runKubectl("create", "-f", nautilusPath, fmt.Sprintf("--namespace=%v", ns))
@ -115,7 +115,7 @@ var _ = Describe("kubectl", func() {
return
}
defer cleanup(guestbookPath, frontendSelector, redisMasterSelector, redisSlaveSelector)
defer cleanup(guestbookPath, ns, frontendSelector, redisMasterSelector, redisSlaveSelector)
By("creating all guestbook components")
runKubectl("create", "-f", guestbookPath, fmt.Sprintf("--namespace=%v", ns))

11
test/e2e/util.go
View File

@ -212,12 +212,17 @@ func expectNoError(err error, explain ...interface{}) {
ExpectWithOffset(1, err).NotTo(HaveOccurred(), explain...)
}
func cleanup(filePath string, selectors ...string) {
// Stops everything from filePath from namespace ns and checks if everything maching selectors from the given namespace is correctly stopped.
func cleanup(filePath string, ns string, selectors ...string) {
By("using stop to clean up resources")
runKubectl("stop", "-f", filePath)
var nsArg string
if ns != "" {
nsArg = fmt.Sprintf("--namespace=%s", ns)
}
runKubectl("stop", "-f", filePath, nsArg)
for _, selector := range selectors {
resources := runKubectl("get", "pods,rc,se", "-l", selector, "--no-headers")
resources := runKubectl("get", "pods,rc,se", "-l", selector, "--no-headers", nsArg)
if resources != "" {
Failf("Resources left running after stop:\n%s", resources)
}