tests: remove whitelist feature (#23297)
This commit is contained in:
parent
860184d542
commit
85afdeef37
@ -89,11 +89,10 @@ func findLine(data []byte, offset int64) (line int) {
|
||||
|
||||
// testMatcher controls skipping and chain config assignment to tests.
|
||||
type testMatcher struct {
|
||||
configpat []testConfig
|
||||
failpat []testFailure
|
||||
skiploadpat []*regexp.Regexp
|
||||
slowpat []*regexp.Regexp
|
||||
whitelistpat *regexp.Regexp
|
||||
configpat []testConfig
|
||||
failpat []testFailure
|
||||
skiploadpat []*regexp.Regexp
|
||||
slowpat []*regexp.Regexp
|
||||
}
|
||||
|
||||
type testConfig struct {
|
||||
@ -124,10 +123,6 @@ func (tm *testMatcher) fails(pattern string, reason string) {
|
||||
tm.failpat = append(tm.failpat, testFailure{regexp.MustCompile(pattern), reason})
|
||||
}
|
||||
|
||||
func (tm *testMatcher) whitelist(pattern string) {
|
||||
tm.whitelistpat = regexp.MustCompile(pattern)
|
||||
}
|
||||
|
||||
// config defines chain config for tests matching the pattern.
|
||||
func (tm *testMatcher) config(pattern string, cfg params.ChainConfig) {
|
||||
tm.configpat = append(tm.configpat, testConfig{regexp.MustCompile(pattern), cfg})
|
||||
@ -217,11 +212,6 @@ func (tm *testMatcher) runTestFile(t *testing.T, path, name string, runTest inte
|
||||
if r, _ := tm.findSkip(name); r != "" {
|
||||
t.Skip(r)
|
||||
}
|
||||
if tm.whitelistpat != nil {
|
||||
if !tm.whitelistpat.MatchString(name) {
|
||||
t.Skip("Skipped by whitelist")
|
||||
}
|
||||
}
|
||||
t.Parallel()
|
||||
|
||||
// Load the file as map[string]<testType>.
|
||||
@ -275,14 +265,3 @@ func runTestFunc(runTest interface{}, t *testing.T, name string, m reflect.Value
|
||||
m.MapIndex(reflect.ValueOf(key)),
|
||||
})
|
||||
}
|
||||
|
||||
func TestMatcherWhitelist(t *testing.T) {
|
||||
t.Parallel()
|
||||
tm := new(testMatcher)
|
||||
tm.whitelist("invalid*")
|
||||
tm.walk(t, rlpTestDir, func(t *testing.T, name string, test *RLPTest) {
|
||||
if name[:len("invalidRLPTest.json")] != "invalidRLPTest.json" {
|
||||
t.Fatalf("invalid test found: %s != invalidRLPTest.json", name)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user