mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #87903 from oomichi/e2eskipper
Update conformance requirement check
This commit is contained in:
commit
d1361c5a91
@ -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) {
|
||||||
|
Loading…
Reference in New Issue
Block a user