From a8abf7091a24704c1ea1568ad3be9a4180503020 Mon Sep 17 00:00:00 2001 From: mik2k2 <44849223+mik2k2@users.noreply.github.com> Date: Wed, 22 Dec 2021 13:47:54 +0100 Subject: [PATCH] Revert "possibly fix the test timeout in HostNameCollision" (didn't work) This reverts commit 664dbb0976f8f10ea7a673950a879591c2e7c320. --- host_test.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/host_test.go b/host_test.go index 1f4d5f9..409f200 100644 --- a/host_test.go +++ b/host_test.go @@ -108,11 +108,9 @@ func TestHostNameCollision(t *testing.T) { s, host := getHost(t, nil) defer s.Close() - newUsers1 := make(chan *message.User) - newUsers2 := make(chan *message.User) + newUsers := make(chan *message.User) host.OnUserJoined = func(u *message.User) { - newUsers1 <- u - newUsers2 <- u + newUsers <- u } go host.Serve() @@ -121,7 +119,6 @@ func TestHostNameCollision(t *testing.T) { // First client g.Go(func() error { return sshd.ConnectShell(s.Addr().String(), "foo", func(r io.Reader, w io.WriteCloser) error { - <-newUsers1 scanner := bufio.NewScanner(r) // Consume the initial buffer @@ -133,7 +130,7 @@ func TestHostNameCollision(t *testing.T) { } // wait for the second client - <-newUsers1 + <-newUsers scanner.Scan() actual = scanner.Text() @@ -155,9 +152,8 @@ func TestHostNameCollision(t *testing.T) { // Second client g.Go(func() error { // wait for the first client - <-newUsers2 + <-newUsers return sshd.ConnectShell(s.Addr().String(), "foo", func(r io.Reader, w io.WriteCloser) error { - <-newUsers2 scanner := bufio.NewScanner(r) // Consume the initial buffer scanner.Scan()