Fix more silly race conditions in tests
authorAndrey Petrov <andrey.petrov@shazow.net>
Mon, 11 Jul 2016 17:02:34 +0000 (13:02 -0400)
committerAndrey Petrov <andrey.petrov@shazow.net>
Mon, 11 Jul 2016 17:02:34 +0000 (13:02 -0400)
host_test.go

index e44b877e4c49ff0ea9f8a8cf81af60dc710c2804..e5c32d77dc754b16a75c83d68c55e80847eac968 100644 (file)
@@ -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.