Merge branch 'master' into constants

This commit is contained in:
Chris Rhodes 2013-02-15 18:28:39 -08:00
commit 7e62cfb077
1 changed files with 4 additions and 0 deletions

View File

@ -33,6 +33,10 @@ func setUp(t *testing.T, start ...bool) (*Conn, *testState) {
// Hack to allow tests of send, recv, write etc. // Hack to allow tests of send, recv, write etc.
// NOTE: the value of the boolean doesn't matter. // NOTE: the value of the boolean doesn't matter.
c.postConnect() c.postConnect()
// All connections start with NICK/USER expect these.
nc.Expect("NICK test")
nc.Expect("USER test 12 * :Testing IRC")
// Sleep 1ms to allow background routines to start. // Sleep 1ms to allow background routines to start.
<-time.After(1e6) <-time.After(1e6)
} }