test/e2e/framework: remove skip.go and use e2eskipper subpackage

This commit is contained in:
tanjunchen
2020-02-01 01:18:48 +08:00
parent 7f0ea141d2
commit 7ff3a1f8db
23 changed files with 219 additions and 268 deletions

View File

@@ -28,6 +28,7 @@ import (
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/kubernetes/test/e2e/framework"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
imageutils "k8s.io/kubernetes/test/utils/image"
"github.com/onsi/ginkgo"
@@ -75,7 +76,7 @@ var _ = framework.KubeDescribe("Security Context", func() {
isEnabled, err := isSharedPIDNamespaceSupported()
framework.ExpectNoError(err)
if !isEnabled {
framework.Skipf("Skipped because shared PID namespace is not supported by this docker version.")
e2eskipper.Skipf("Skipped because shared PID namespace is not supported by this docker version.")
}
ginkgo.By("Create a pod with shared PID namespace.")