cerc-io/plugeth
17
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1968 from karalabe/fix-json-tests-datarace

Browse Source 
tests: fix data race in bad-block-report disabling during tests
This commit is contained in:
Felix Lange 2015-11-05 12:59:07 +01:00
commit ca4f6d0fdd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/init.go
View File

@ -56,13 +56,16 @@ var (
VmSkipTests = []string{} VmSkipTests = []string{}
) )
// Disable reporting bad blocks for the tests
func init() {
core.DisableBadBlockReporting = true
}
func readJson(reader io.Reader, value interface{}) error { func readJson(reader io.Reader, value interface{}) error {
data, err := ioutil.ReadAll(reader) data, err := ioutil.ReadAll(reader)
if err != nil { if err != nil {
return fmt.Errorf("Error reading JSON file", err.Error()) return fmt.Errorf("Error reading JSON file", err.Error())
} }
core.DisableBadBlockReporting = true
if err = json.Unmarshal(data, &value); err != nil { if err = json.Unmarshal(data, &value); err != nil {
if syntaxerr, ok := err.(*json.SyntaxError); ok { if syntaxerr, ok := err.(*json.SyntaxError); ok {
line := findLine(data, syntaxerr.Offset) line := findLine(data, syntaxerr.Offset)