From 2b8c0d7b5c66fec23d3c25dcd7800a379e45d429 Mon Sep 17 00:00:00 2001 From: Andrey Petrov Date: Mon, 11 Jul 2016 13:02:34 -0400 Subject: [PATCH] Fix more silly race conditions in tests --- host_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/host_test.go b/host_test.go index e44b877..e5c32d7 100644 --- a/host_test.go +++ b/host_test.go @@ -184,10 +184,13 @@ func TestHostKick(t *testing.T) { go func() { // First client - err = sshd.ConnectShell(addr, "foo", func(r io.Reader, w io.WriteCloser) { + err := sshd.ConnectShell(addr, "foo", func(r io.Reader, w io.WriteCloser) { // Make op member, _ := host.Room.MemberById("foo") - member.Op = true + if member == nil { + t.Fatal("failed to load MemberById") + } + host.Room.Ops.Add(member) // Block until second client is here connected <- struct{}{} @@ -200,7 +203,7 @@ func TestHostKick(t *testing.T) { go func() { // Second client - err = sshd.ConnectShell(addr, "bar", func(r io.Reader, w io.WriteCloser) { + err := sshd.ConnectShell(addr, "bar", func(r io.Reader, w io.WriteCloser) { <-connected // Consume while we're connected. Should break when kicked.