Fix dial tests (#439)

deansheather · web-flow · commit 426b18cebde1 · 2021-09-10T00:22:14.000Z
diff --git a/wsnet/dial.go b/wsnet/dial.go
@@ -178,7 +178,9 @@ func Dial(ctx context.Context, conn net.Conn, options *DialOptions) (*Dialer, er
 
 	err = dialer.negotiate(ctx)
 	if err != nil {
-		return nil, xerrors.Errorf("negotiate rtc connection: %w", err)
+		// Return the dialer since we have tests that verify things are closed
+		// if negotiation fails.
+		return dialer, xerrors.Errorf("negotiate rtc connection: %w", err)
 	}
 
 	return dialer, nil
diff --git a/wsnet/dial_test.go b/wsnet/dial_test.go
@@ -62,7 +62,15 @@ func TestDial(t *testing.T) {
 		defer cancelFunc()
 		dialer, err := DialWebsocket(ctx, connectAddr, nil, nil)
 		require.True(t, errors.Is(err, context.DeadlineExceeded))
+		require.NotNil(t, dialer)
 		require.Error(t, dialer.conn.Close(), "already wrote close")
+
+		// Ensure the rtc peer connection is closed. Setting the config options
+		// to empty struct does nothing, but it does fail if the rtc peer conn
+		// is closed.
+		err = dialer.rtc.SetConfiguration(webrtc.Configuration{})
+		require.Error(t, err)
+		require.ErrorIs(t, err, webrtc.ErrConnectionClosed)
 	})
 
 	t.Run("Ping", func(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,9 @@ func Dial(ctx context.Context, conn net.Conn, options DialOptions) (Dialer, er`
`178`	`178`
`179`	`179`	`err = dialer.negotiate(ctx)`
`180`	`180`	`if err != nil {`
`181`		`- return nil, xerrors.Errorf("negotiate rtc connection: %w", err)`
	`181`	`+ // Return the dialer since we have tests that verify things are closed`
	`182`	`+ // if negotiation fails.`
	`183`	`+ return dialer, xerrors.Errorf("negotiate rtc connection: %w", err)`
`182`	`184`	`}`
`183`	`185`
`184`	`186`	`return dialer, nil`