status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

whisper: fix time.sleep by time.ticker in whisper_test (#21251)

This commit is contained in:
ucwong 2020-06-23 16:46:59 +08:00 committed by GitHub
parent 9a188c975d
commit dce533c246
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
whisper/whisperv6/whisper_test.go
View File

@ -489,8 +489,10 @@ func TestExpiry(t *testing.T) {
// wait till received or timeout // wait till received or timeout
var received, expired bool var received, expired bool
ticker := time.NewTicker(100 * time.Millisecond)
defer ticker.Stop()
for j := 0; j < 20; j++ { for j := 0; j < 20; j++ {
time.Sleep(100 * time.Millisecond) <-ticker.C
if len(w.Envelopes()) == messagesCount { if len(w.Envelopes()) == messagesCount {
received = true received = true
break break
@ -503,7 +505,7 @@ func TestExpiry(t *testing.T) {
// wait till expired or timeout // wait till expired or timeout
for j := 0; j < 20; j++ { for j := 0; j < 20; j++ {
time.Sleep(100 * time.Millisecond) <-ticker.C
if len(w.Envelopes()) == 0 { if len(w.Envelopes()) == 0 {
expired = true expired = true
break break
@ -582,8 +584,10 @@ func TestCustomization(t *testing.T) {
// wait till received or timeout // wait till received or timeout
var received bool var received bool
ticker := time.NewTicker(100 * time.Millisecond)
defer ticker.Stop()
for j := 0; j < 20; j++ { for j := 0; j < 20; j++ {
time.Sleep(100 * time.Millisecond) <-ticker.C
if len(w.Envelopes()) > 1 { if len(w.Envelopes()) > 1 {
received = true received = true
break break
@ -599,7 +603,7 @@ func TestCustomization(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("failed subscribe with seed %d: %s.", seed, err) t.Fatalf("failed subscribe with seed %d: %s.", seed, err)
} }
time.Sleep(5 * time.Millisecond) <-ticker.C
mail := f.Retrieve() mail := f.Retrieve()
if len(mail) > 0 { if len(mail) > 0 {
t.Fatalf("received premature mail") t.Fatalf("received premature mail")
@ -670,8 +674,10 @@ func TestSymmetricSendCycle(t *testing.T) {
// wait till received or timeout // wait till received or timeout
var received bool var received bool
ticker := time.NewTicker(10 * time.Millisecond)
defer ticker.Stop()
for j := 0; j < 200; j++ { for j := 0; j < 200; j++ {
time.Sleep(10 * time.Millisecond) <-ticker.C
if len(w.Envelopes()) > 0 { if len(w.Envelopes()) > 0 {
received = true received = true
break break
@ -683,7 +689,7 @@ func TestSymmetricSendCycle(t *testing.T) {
} }
// check w.messages() // check w.messages()
time.Sleep(5 * time.Millisecond) <-ticker.C
mail1 := filter1.Retrieve() mail1 := filter1.Retrieve()
mail2 := filter2.Retrieve() mail2 := filter2.Retrieve()
if len(mail2) == 0 { if len(mail2) == 0 {
@ -743,8 +749,10 @@ func TestSymmetricSendWithoutAKey(t *testing.T) {
// wait till received or timeout // wait till received or timeout
var received bool var received bool
ticker := time.NewTicker(10 * time.Millisecond)
defer ticker.Stop()
for j := 0; j < 200; j++ { for j := 0; j < 200; j++ {
time.Sleep(10 * time.Millisecond) <-ticker.C
if len(w.Envelopes()) > 0 { if len(w.Envelopes()) > 0 {
received = true received = true
break break
@ -756,7 +764,7 @@ func TestSymmetricSendWithoutAKey(t *testing.T) {
} }
// check w.messages() // check w.messages()
time.Sleep(5 * time.Millisecond) <-ticker.C
mail := filter.Retrieve() mail := filter.Retrieve()
if len(mail) == 0 { if len(mail) == 0 {
t.Fatalf("did not receive message in spite of not setting a public key") t.Fatalf("did not receive message in spite of not setting a public key")
@ -809,8 +817,10 @@ func TestSymmetricSendKeyMismatch(t *testing.T) {
// wait till received or timeout // wait till received or timeout
var received bool var received bool
ticker := time.NewTicker(10 * time.Millisecond)
defer ticker.Stop()
for j := 0; j < 200; j++ { for j := 0; j < 200; j++ {
time.Sleep(10 * time.Millisecond) <-ticker.C
if len(w.Envelopes()) > 0 { if len(w.Envelopes()) > 0 {
received = true received = true
break break
@ -822,7 +832,7 @@ func TestSymmetricSendKeyMismatch(t *testing.T) {
} }
// check w.messages() // check w.messages()
time.Sleep(5 * time.Millisecond) <-ticker.C
mail := filter.Retrieve() mail := filter.Retrieve()
if len(mail) > 0 { if len(mail) > 0 {
t.Fatalf("received a message when keys weren't matching") t.Fatalf("received a message when keys weren't matching")