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

Merge pull request #87903 from oomichi/e2eskipper

Browse Source 
Update conformance requirement check
This commit is contained in:
Kubernetes Prow Robot 2020-02-21 18:31:15 -08:00 committed by GitHub
commit d1361c5a91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/conformance/check_conformance_test_requirements.go
View File

@ -34,7 +34,7 @@ const (
//e.g. framework.ConformanceIt("should provide secure master service ", func() { //e.g. framework.ConformanceIt("should provide secure master service ", func() {
patternStartConformance = `framework.ConformanceIt\(.*, func\(\) {$` patternStartConformance = `framework.ConformanceIt\(.*, func\(\) {$`
patternEndConformance = `}\)$` patternEndConformance = `}\)$`
patternSkip = `framework.Skip.*\(` patternSkip = `e2eskipper.Skip.*\(`
) )
// This function checks the requirement: it works for all providers (e.g., no SkipIfProviderIs/SkipUnlessProviderIs calls) // 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 inConformanceCode {
if regSkip.MatchString(line) { if regSkip.MatchString(line) {
// To list all invalid places in a single operation of this tool, here doesn't return error and continues checking. // 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 checkFailed = true
} }
if regEndConformance.MatchString(line) { if regEndConformance.MatchString(line) {