github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

test/e2e/ui and test/e2e/upgrades:Use e2eskipper package

Browse Source 
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
This commit is contained in:
yuxiaobo 2020-01-13 14:19:50 +08:00
parent 36e40fb850
commit 07f31b3b17
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/ui/BUILD
View File

@ -15,6 +15,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/service:go_default_library",
"//test/e2e/framework/skipper:go_default_library",
"//test/utils:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
],

3
test/e2e/ui/dashboard.go
View File

@ -27,6 +27,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/test/e2e/framework"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
testutils "k8s.io/kubernetes/test/utils"
"github.com/onsi/ginkgo"
@ -35,7 +36,7 @@ import (
var _ = SIGDescribe("Kubernetes Dashboard [Feature:Dashboard]", func() {
ginkgo.BeforeEach(func() {
// TODO(kubernetes/kubernetes#61559): Enable dashboard here rather than skip the test.
framework.SkipIfProviderIs("gke")
e2eskipper.SkipIfProviderIs("gke")
})
const (

1
test/e2e/upgrades/BUILD
View File

@ -41,6 +41,7 @@ go_library(
"//test/e2e/framework/node:go_default_library",
"//test/e2e/framework/security:go_default_library",
"//test/e2e/framework/service:go_default_library",
"//test/e2e/framework/skipper:go_default_library",
"//test/e2e/framework/statefulset:go_default_library",
"//test/e2e/framework/testfiles:go_default_library",
"//test/e2e/scheduling:go_default_library",

1
test/e2e/upgrades/storage/BUILD
View File

@ -20,6 +20,7 @@ go_library(
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/pod:go_default_library",
"//test/e2e/framework/pv:go_default_library",
"//test/e2e/framework/skipper:go_default_library",
"//test/e2e/storage/utils:go_default_library",
"//test/e2e/upgrades:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",

3
test/e2e/upgrades/storage/persistent_volumes.go
View File

@ -22,6 +22,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/upgrades"
"github.com/onsi/ginkgo"
@ -46,7 +47,7 @@ const (
func (t *PersistentVolumeUpgradeTest) Setup(f *framework.Framework) {
var err error
framework.SkipUnlessProviderIs("gce", "gke", "openstack", "aws", "vsphere", "azure")
e2eskipper.SkipUnlessProviderIs("gce", "gke", "openstack", "aws", "vsphere", "azure")
ns := f.Namespace.Name

5
test/e2e/upgrades/sysctl.go
View File

@ -28,6 +28,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/sysctl"
"k8s.io/kubernetes/test/e2e/framework"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
imageutils "k8s.io/kubernetes/test/utils/image"
)
@ -87,7 +88,7 @@ func (t *SysctlUpgradeTest) verifySafeSysctlWork(f *framework.Framework) *v1.Pod
ev, err := f.PodClient().WaitForErrorEventOrSuccess(t.validPod)
framework.ExpectNoError(err)
if ev != nil && ev.Reason == sysctl.UnsupportedReason {
framework.Skipf("No sysctl support in Docker <1.12")
e2eskipper.Skipf("No sysctl support in Docker <1.12")
}
f.TestContainerOutput("pod with safe sysctl launched", t.validPod, 0, []string{fmt.Sprintf("%s = %s", safeSysctl, safeSysctlValue)})
@ -105,7 +106,7 @@ func (t *SysctlUpgradeTest) verifyUnsafeSysctlsAreRejected(f *framework.Framewor
ev, err := f.PodClient().WaitForErrorEventOrSuccess(invalidPod)
framework.ExpectNoError(err)
if ev != nil && ev.Reason == sysctl.UnsupportedReason {
framework.Skipf("No sysctl support in Docker <1.12")
e2eskipper.Skipf("No sysctl support in Docker <1.12")
}
framework.ExpectEqual(ev.Reason, sysctl.ForbiddenReason)