mirror
/
goirc
mirror of https://github.com/fluffle/goirc
1
0
Fork 0
Code Issues Releases Wiki Activity

Streamline timers in mockNetConn slightly.

This commit is contained in:
Alex Bramley 2011-11-11 08:00:18 +00:00
parent bfdd895ca6
commit 38cd23891a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/mocknetconn_test.go
View File

@ -75,13 +75,11 @@ func (m *mockNetConn) Send(s string) {
} }
func (m *mockNetConn) Expect(e string) { func (m *mockNetConn) Expect(e string) {
t := time.NewTimer(5e6)
select { select {
case <-t.C: case <-time.After(1e6):
m.Errorf("Mock connection did not receive expected output.\n\t"+ m.Errorf("Mock connection did not receive expected output.\n\t"+
"Expected: '%s', got nothing.", e) "Expected: '%s', got nothing.", e)
case s := <-m.Out: case s := <-m.Out:
t.Stop()
s = strings.Trim(s, "\r\n") s = strings.Trim(s, "\r\n")
if e != s { if e != s {
m.Errorf("Mock connection received unexpected value.\n\t"+ m.Errorf("Mock connection received unexpected value.\n\t"+
@ -91,11 +89,9 @@ func (m *mockNetConn) Expect(e string) {
} }
func (m *mockNetConn) ExpectNothing() { func (m *mockNetConn) ExpectNothing() {
t := time.NewTimer(5e6)
select { select {
case <-t.C: case <-time.After(1e6):
case s := <-m.Out: case s := <-m.Out:
t.Stop()
s = strings.Trim(s, "\r\n") s = strings.Trim(s, "\r\n")
m.Errorf("Mock connection received unexpected output.\n\t"+ m.Errorf("Mock connection received unexpected output.\n\t"+
"Expected nothing, got: '%s'", s) "Expected nothing, got: '%s'", s)