roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/geth: fix IPC probe in les test (#23094)

Browse Source 
Previously, the test waited a second and then failed if geth had not
started. This caused the test to fail intermittently. This change checks
whether the IPC is open 10 times over a 5 second period and then fails
if geth is still not available.
This commit is contained in:
piersy 2021-06-25 11:40:37 +01:00 committed by GitHub
parent 948a600ed5
commit 0e6961366a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/geth/les_test.go
View File

@ -137,14 +137,18 @@ func startGethWithIpc(t *testing.T, name string, args ...string) *gethrpc {
name: name, name: name,
geth: runGeth(t, args...), geth: runGeth(t, args...),
} }
// wait before we can attach to it. TODO: probe for it properly
time.Sleep(1 * time.Second)
var err error
ipcpath := ipcEndpoint(ipcName, g.geth.Datadir) ipcpath := ipcEndpoint(ipcName, g.geth.Datadir)
if g.rpc, err = rpc.Dial(ipcpath); err != nil { // We can't know exactly how long geth will take to start, so we try 10
t.Fatalf("%v rpc connect to %v: %v", name, ipcpath, err) // times over a 5 second period.
var err error
for i := 0; i < 10; i++ {
time.Sleep(500 * time.Millisecond)
if g.rpc, err = rpc.Dial(ipcpath); err == nil {
return g
}
} }
return g t.Fatalf("%v rpc connect to %v: %v", name, ipcpath, err)
return nil
} }
func initGeth(t *testing.T) string { func initGeth(t *testing.T) string {