From 0d2829c180c35ad0b6248e9cf9793142e71d70b5 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Tue, 5 Oct 2021 14:26:10 +0200
Subject: [PATCH] test: get rid of testUpstream

No need for this complexity.
---
 server_test.go | 38 +++++++++++---------------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/server_test.go b/server_test.go
index 2882627..c087d0e 100644
--- a/server_test.go
+++ b/server_test.go
@@ -47,36 +47,12 @@ func createTestDownstream(t *testing.T, srv *Server) ircConn {
 	return newNetIRCConn(c2)
 }
 
-type testUpstream struct {
-	net.Listener
-	Accept chan ircConn
-}
-
-func createTestUpstream(t *testing.T, db Database, user *User) (*Network, *testUpstream) {
+func createTestUpstream(t *testing.T, db Database, user *User) (*Network, net.Listener) {
 	ln, err := net.Listen("tcp", "localhost:0")
 	if err != nil {
 		t.Fatalf("failed to create TCP listener: %v", err)
 	}
 
-	tu := &testUpstream{
-		Listener: ln,
-		Accept:   make(chan ircConn),
-	}
-
-	go func() {
-		defer close(tu.Accept)
-
-		for {
-			c, err := ln.Accept()
-			if isErrClosed(err) {
-				break
-			} else if err != nil {
-				t.Fatalf("failed accepting connection: %v", err)
-			}
-			tu.Accept <- newNetIRCConn(c)
-		}
-	}()
-
 	network := &Network{
 		Name:    "testnet",
 		Addr:    "irc+insecure://" + ln.Addr().String(),
@@ -87,7 +63,15 @@ func createTestUpstream(t *testing.T, db Database, user *User) (*Network, *testU
 		t.Fatalf("failed to store test network: %v", err)
 	}
 
-	return network, tu
+	return network, ln
+}
+
+func mustAccept(t *testing.T, ln net.Listener) ircConn {
+	c, err := ln.Accept()
+	if err != nil {
+		t.Fatalf("failed accepting connection: %v", err)
+	}
+	return newNetIRCConn(c)
 }
 
 func expectMessage(t *testing.T, c ircConn, cmd string) *irc.Message {
@@ -169,7 +153,7 @@ func TestServer(t *testing.T) {
 	}
 	defer srv.Shutdown()
 
-	uc := <-upstream.Accept
+	uc := mustAccept(t, upstream)
 	defer uc.Close()
 	registerUpstreamConn(t, uc)