zishuo/go-libp2p
1
0
Fork 0
mirror of https://github.com/libp2p/go-libp2p.git synced 2025-10-06 08:37:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: fix flaky example test

Browse Source 
If we run the listener async, we might get expected events out of order.
This commit is contained in:
Steven Allen
2021-07-22 14:46:15 -07:00
parent 5d3b015018
commit a060bf9eba
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/echo/main.go
View File

@@ -49,7 +49,9 @@ func main() {
} }
if *targetF == "" { if *targetF == "" {
runListener(ctx, ha, *listenF, *insecureF) startListener(ctx, ha, *listenF, *insecureF)
// Run until canceled.
<-ctx.Done()
} else { } else {
runSender(ctx, ha, *targetF) runSender(ctx, ha, *targetF)
} }
@@ -95,7 +97,7 @@ func getHostAddress(ha host.Host) string {
return addr.Encapsulate(hostAddr).String() return addr.Encapsulate(hostAddr).String()
} }
func runListener(ctx context.Context, ha host.Host, listenPort int, insecure bool) { func startListener(ctx context.Context, ha host.Host, listenPort int, insecure bool) {
fullAddr := getHostAddress(ha) fullAddr := getHostAddress(ha)
log.Printf("I am %s\n", fullAddr) log.Printf("I am %s\n", fullAddr)
@@ -118,9 +120,6 @@ func runListener(ctx context.Context, ha host.Host, listenPort int, insecure boo
} else { } else {
log.Printf("Now run \"./echo -l %d -d %s\" on a different terminal\n", listenPort+1, fullAddr) log.Printf("Now run \"./echo -l %d -d %s\" on a different terminal\n", listenPort+1, fullAddr)
} }
// Wait until canceled
<-ctx.Done()
} }
func runSender(ctx context.Context, ha host.Host, targetPeer string) { func runSender(ctx context.Context, ha host.Host, targetPeer string) {

2
examples/echo/main_test.go
View File

@@ -43,7 +43,7 @@ func TestMain(t *testing.T) {
return return
} }
go runListener(ctx, lh, lport, true) startListener(ctx, lh, lport, true)
// Make sender // Make sender
listenAddr := getHostAddress(lh) listenAddr := getHostAddress(lh)