Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
9dc5de51
Commit
9dc5de51
authored
9 years ago
by
Péter Szilágyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tests: fix data race in bad-block-report disabling during tests
parent
e3f36d97
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
init.go
tests/init.go
+5
-2
No files found.
tests/init.go
View file @
9dc5de51
...
...
@@ -56,13 +56,16 @@ var (
VmSkipTests
=
[]
string
{}
)
// Disable reporting bad blocks for the tests
func
init
()
{
core
.
DisableBadBlockReporting
=
true
}
func
readJson
(
reader
io
.
Reader
,
value
interface
{})
error
{
data
,
err
:=
ioutil
.
ReadAll
(
reader
)
if
err
!=
nil
{
return
fmt
.
Errorf
(
"Error reading JSON file"
,
err
.
Error
())
}
core
.
DisableBadBlockReporting
=
true
if
err
=
json
.
Unmarshal
(
data
,
&
value
);
err
!=
nil
{
if
syntaxerr
,
ok
:=
err
.
(
*
json
.
SyntaxError
);
ok
{
line
:=
findLine
(
data
,
syntaxerr
.
Offset
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment