From c213bbb09758efdf70e705adebf678d5ebb8eb92 Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Sun, 6 Aug 2017 01:10:25 +0800 Subject: [PATCH 1/2] Add prefix to common networking e2e tests --- test/e2e/common/BUILD | 1 + test/e2e/common/networking.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index 58d5b24aa60..3f56c90739b 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -42,6 +42,7 @@ go_library( "//pkg/kubelet/sysctl:go_default_library", "//pkg/security/apparmor:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/network:go_default_library", "//test/utils:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", diff --git a/test/e2e/common/networking.go b/test/e2e/common/networking.go index 1fe9a56a785..1f43bed6e99 100644 --- a/test/e2e/common/networking.go +++ b/test/e2e/common/networking.go @@ -20,12 +20,13 @@ import ( . "github.com/onsi/ginkgo" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/kubernetes/test/e2e/network" ) -var _ = framework.KubeDescribe("Networking", func() { +var _ = network.SIGDescribe("Networking", func() { f := framework.NewDefaultFramework("pod-network-test") - framework.KubeDescribe("Granular Checks: Pods", func() { + Describe("Granular Checks: Pods", func() { // Try to hit all endpoints through a test container, retry 5 times, // expect exactly one unique hostname. Each of these endpoints reports From ccee8dca512d0f317a4c0925d5fc7f2a14a71088 Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Mon, 14 Aug 2017 22:44:41 +0800 Subject: [PATCH 2/2] Use Describe to add prefix --- test/e2e/common/BUILD | 1 - test/e2e/common/networking.go | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index 3f56c90739b..58d5b24aa60 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -42,7 +42,6 @@ go_library( "//pkg/kubelet/sysctl:go_default_library", "//pkg/security/apparmor:go_default_library", "//test/e2e/framework:go_default_library", - "//test/e2e/network:go_default_library", "//test/utils:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", diff --git a/test/e2e/common/networking.go b/test/e2e/common/networking.go index 1f43bed6e99..bacefe9c962 100644 --- a/test/e2e/common/networking.go +++ b/test/e2e/common/networking.go @@ -20,10 +20,9 @@ import ( . "github.com/onsi/ginkgo" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/test/e2e/framework" - "k8s.io/kubernetes/test/e2e/network" ) -var _ = network.SIGDescribe("Networking", func() { +var _ = Describe("[sig-network] Networking", func() { f := framework.NewDefaultFramework("pod-network-test") Describe("Granular Checks: Pods", func() {