Merge pull request #490 from blinklabs-io/test/handshake-server-panic-fix

agaffney · web-flow · commit 3e3e4cd4a12a · 2024-02-11T18:16:10.000-06:00
test: fix random panic in handshake server tests
diff --git a/protocol/handshake/server_test.go b/protocol/handshake/server_test.go
@@ -122,13 +122,8 @@ func TestServerHandshakeRefuseVersionMismatch(t *testing.T) {
 		if err.Error() != expectedErr.Error() {
 			t.Fatalf("unexpected error when creating Ouroboros object: %s", err)
 		}
+	} else {
+		oConn.Close()
+		t.Fatalf("did not receive expected error")
 	}
-	// Async error handler
-	go func() {
-		err, ok := <-oConn.ErrorChan()
-		if !ok {
-			return
-		}
-		panic(fmt.Sprintf("unexpected Ouroboros error: %s", err))
-	}()
 }

Original file line number	Diff line number	Diff line change
`@@ -122,13 +122,8 @@ func TestServerHandshakeRefuseVersionMismatch(t *testing.T) {`
`122`	`122`	`if err.Error() != expectedErr.Error() {`
`123`	`123`	`t.Fatalf("unexpected error when creating Ouroboros object: %s", err)`
`124`	`124`	`}`
	`125`	`+ } else {`
	`126`	`+ oConn.Close()`
	`127`	`+ t.Fatalf("did not receive expected error")`
`125`	`128`	`}`
`126`		`- // Async error handler`
`127`		`- go func() {`
`128`		`- err, ok := <-oConn.ErrorChan()`
`129`		`- if !ok {`
`130`		`- return`
`131`		`- }`
`132`		`- panic(fmt.Sprintf("unexpected Ouroboros error: %s", err))`
`133`		`- }()`
`134`	`129`	`}`