Changeset 604 in code for trunk/server_test.go

Timestamp:

Oct 5, 2021, 12:26:10 PM (4 years ago)

Author:

contact

Message:

test: get rid of testUpstream

No need for this complexity.

File:

• trunk/server_test.go (modified) (3 diffs)

trunk/server_test.go

@@ -48 +48 @@
 }
 
-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{
@@ -88 +64 @@
         }
 
-        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)
 }
 
@@ -170 +154 @@
         defer srv.Shutdown()
 
-        uc := <-upstream.Accept
+        uc := mustAccept(t, upstream)
         defer uc.Close()
         registerUpstreamConn(t, uc)