github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Import kubectl tests in e2e_test.go so they start running. 

Also rename the Describe function
pull/6/head
Phillip Wittrock 2017-07-13 13:16:43 -07:00
parent 2b5b4d26ae
commit 3c3c271d07
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/BUILD
View File

@ -24,6 +24,7 @@ go_test(
"//test/e2e/cluster-logging:go_default_library", "//test/e2e/cluster-logging:go_default_library",
"//test/e2e/extension:go_default_library", "//test/e2e/extension:go_default_library",
"//test/e2e/framework:go_default_library", "//test/e2e/framework:go_default_library",
"//test/e2e/kubectl:go_default_library",
"//test/e2e/metrics:go_default_library", "//test/e2e/metrics:go_default_library",
"//test/e2e/scalability:go_default_library", "//test/e2e/scalability:go_default_library",
"//test/e2e/scheduling:go_default_library", "//test/e2e/scheduling:go_default_library",

1
test/e2e/e2e_test.go
View File

@ -24,6 +24,7 @@ import (
_ "k8s.io/kubernetes/test/e2e/cluster-logging" _ "k8s.io/kubernetes/test/e2e/cluster-logging"
_ "k8s.io/kubernetes/test/e2e/extension" _ "k8s.io/kubernetes/test/e2e/extension"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
_ "k8s.io/kubernetes/test/e2e/kubectl"
_ "k8s.io/kubernetes/test/e2e/scalability" _ "k8s.io/kubernetes/test/e2e/scalability"
_ "k8s.io/kubernetes/test/e2e/scheduling" _ "k8s.io/kubernetes/test/e2e/scheduling"
_ "k8s.io/kubernetes/test/e2e/storage" _ "k8s.io/kubernetes/test/e2e/storage"

6
test/e2e/kubectl/framework.go
View File

@ -16,8 +16,8 @@ limitations under the License.
package kubectl package kubectl
import "k8s.io/kubernetes/test/e2e/framework" import "github.com/onsi/ginkgo"
func kubectlDescribe(text string, body func()) bool { func SIGDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-cli] "+text, body) return ginkgo.Describe("[sig-cli] "+text, body)
} }

4
test/e2e/kubectl/kubectl.go
View File

@ -186,7 +186,7 @@ func runKubectlRetryOrDie(args ...string) string {
} }
// duplicated setup to avoid polluting "normal" clients with alpha features which confuses the generated clients // duplicated setup to avoid polluting "normal" clients with alpha features which confuses the generated clients
var _ = kubectlDescribe("Kubectl alpha client", func() { var _ = SIGDescribe("Kubectl alpha client", func() {
defer GinkgoRecover() defer GinkgoRecover()
f := framework.NewDefaultFramework("kubectl") f := framework.NewDefaultFramework("kubectl")
@ -275,7 +275,7 @@ var _ = kubectlDescribe("Kubectl alpha client", func() {
}) })
}) })
var _ = kubectlDescribe("Kubectl client", func() { var _ = SIGDescribe("Kubectl client", func() {
defer GinkgoRecover() defer GinkgoRecover()
f := framework.NewDefaultFramework("kubectl") f := framework.NewDefaultFramework("kubectl")

2
test/e2e/kubectl/portforward.go
View File

@ -471,7 +471,7 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) {
verifyLogMessage(logOutput, "^Received expected client data$") verifyLogMessage(logOutput, "^Received expected client data$")
} }
var _ = kubectlDescribe("Kubectl Port forwarding", func() { var _ = SIGDescribe("Kubectl Port forwarding", func() {
f := framework.NewDefaultFramework("port-forwarding") f := framework.NewDefaultFramework("port-forwarding")
framework.KubeDescribe("With a server listening on 0.0.0.0", func() { framework.KubeDescribe("With a server listening on 0.0.0.0", func() {

2
test/e2e/kubectl/proxy.go
View File

@ -51,7 +51,7 @@ const (
proxyHTTPCallTimeout = 30 * time.Second proxyHTTPCallTimeout = 30 * time.Second
) )
var _ = kubectlDescribe("Kubectl Proxy", func() { var _ = SIGDescribe("Kubectl Proxy", func() {
version := api.Registry.GroupOrDie(v1.GroupName).GroupVersion.Version version := api.Registry.GroupOrDie(v1.GroupName).GroupVersion.Version
Context("version "+version, func() { Context("version "+version, func() {
options := framework.FrameworkOptions{ options := framework.FrameworkOptions{