From 7b44ad0606dbd5ce7b2e5cfdc061c69a07d3e17d Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Thu, 6 Feb 2020 20:09:00 +0000 Subject: [PATCH] Update conformance requirement check After solving the issue https://github.com/kubernetes/kubernetes/issues/87047 skip functions have been moved to e2eskipper from e2e framework. This updates the conformance requirement check to follow the move. --- hack/.import-aliases | 1 + hack/conformance/check_conformance_test_requirements.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hack/.import-aliases b/hack/.import-aliases index 3ab1f439128..a9b8a7aefda 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -57,5 +57,6 @@ "k8s.io/kubernetes/test/e2e/framework/pod": "e2epod", "k8s.io/kubernetes/test/e2e/framework/resource": "e2eresource", "k8s.io/kubernetes/test/e2e/framework/service": "e2eservice", + "k8s.io/kubernetes/test/e2e/framework/skipper": "e2eskipper", "k8s.io/kubernetes/test/e2e/framework/ssh": "e2essh" } diff --git a/hack/conformance/check_conformance_test_requirements.go b/hack/conformance/check_conformance_test_requirements.go index 86020faebbf..29eeb5c66ad 100644 --- a/hack/conformance/check_conformance_test_requirements.go +++ b/hack/conformance/check_conformance_test_requirements.go @@ -34,7 +34,7 @@ const ( //e.g. framework.ConformanceIt("should provide secure master service ", func() { patternStartConformance = `framework.ConformanceIt\(.*, func\(\) {$` patternEndConformance = `}\)$` - patternSkip = `framework.Skip.*\(` + patternSkip = `e2eskipper.Skip.*\(` ) // This function checks the requirement: it works for all providers (e.g., no SkipIfProviderIs/SkipUnlessProviderIs calls) @@ -64,7 +64,7 @@ func checkAllProviders(e2eFile string) error { if inConformanceCode { if regSkip.MatchString(line) { // To list all invalid places in a single operation of this tool, here doesn't return error and continues checking. - fmt.Fprintf(os.Stderr, "%v: Conformance test should not call any framework.Skip*()\n", e2eFile) + fmt.Fprintf(os.Stderr, "%v: Conformance test should not call any e2eskipper.Skip*()\n", e2eFile) checkFailed = true } if regEndConformance.MatchString(line) {