Skip to content

Commit 32b16d1

Browse files
davidbendavidben
committedMar 15, 2015
Do away with the explict logger parameter.
That was really overkill. All the expectNoLogs tests are just as easily serviced by looking at test output. There was only one test that actually asserted on log output and that was probably more trouble than was worth it.
1 parent c996b76 commit 32b16d1

10 files changed

+78
-247
lines changed
 

‎connection.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package zephyr
1616

1717
import (
1818
"errors"
19-
"log"
2019
"net"
2120
"sync"
2221
"time"
@@ -81,9 +80,8 @@ func NewConnection(
8180
conn net.PacketConn,
8281
server ServerConfig,
8382
cred *krb5.Credential,
84-
logger *log.Logger,
8583
) (*Connection, error) {
86-
return NewConnectionFull(conn, server, cred, logger, SystemClock)
84+
return NewConnectionFull(conn, server, cred, SystemClock)
8785
}
8886

8987
// NewConnectionFull does the same as NewConnection but takes an
@@ -92,7 +90,6 @@ func NewConnectionFull(
9290
conn net.PacketConn,
9391
server ServerConfig,
9492
cred *krb5.Credential,
95-
logger *log.Logger,
9693
clock Clock,
9794
) (*Connection, error) {
9895
c := new(Connection)
@@ -104,7 +101,7 @@ func NewConnectionFull(
104101
if c.cred != nil {
105102
key = c.cred.KeyBlock
106103
}
107-
c.allNotices = ReadNoticesFromServer(conn, key, logger)
104+
c.allNotices = ReadNoticesFromServer(conn, key)
108105
c.notices = make(chan NoticeReaderResult)
109106
c.ackTable = make(map[UID]chan NoticeReaderResult)
110107

‎connection_test.go

+13-40
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,11 @@ func mockServer(t *testing.T,
5151
expectedAuthStatus AuthStatus,
5252
clock *zephyrtest.MockClock,
5353
numDrop int) {
54-
l, lc := expectNoLogs(t)
55-
defer lc.Close()
56-
5754
// Set some stuff up.
5855
ctx, keytab := makeServerContextAndKeyTab(t)
5956
defer ctx.Free()
6057
defer keytab.Close()
61-
for r := range ReadRawNotices(conn, l) {
58+
for r := range ReadRawNotices(conn) {
6259
authStatus, _, err := r.RawNotice.CheckAuthFromClient(
6360
ctx, krb5test.Service(), keytab)
6461
if err != nil {
@@ -98,8 +95,6 @@ func mockServer(t *testing.T,
9895
// Tests that a Connection forwards received packets out and doesn't
9996
// send SERVACKs out.
10097
func TestConnectionReceive(t *testing.T) {
101-
l, lc := expectNoLogs(t)
102-
defer lc.Close()
10398
ctx, err := krb5.NewContext()
10499
if err != nil {
105100
t.Fatal(err)
@@ -119,7 +114,7 @@ func TestConnectionReceive(t *testing.T) {
119114
close(readChan)
120115
mock := zephyrtest.NewMockPacketConn(clientAddr, readChan)
121116
clock := zephyrtest.NewMockClock()
122-
conn, err := NewConnectionFull(mock, serverConfig, krb5test.Credential(), l, clock)
117+
conn, err := NewConnectionFull(mock, serverConfig, krb5test.Credential(), clock)
123118
if err != nil {
124119
t.Fatal(err)
125120
}
@@ -145,8 +140,6 @@ func TestConnectionReceive(t *testing.T) {
145140
}
146141

147142
func TestConnectionSendNotice(t *testing.T) {
148-
l, lc := expectNoLogs(t)
149-
defer lc.Close()
150143
ctx, err := krb5.NewContext()
151144
if err != nil {
152145
t.Fatal(err)
@@ -158,7 +151,7 @@ func TestConnectionSendNotice(t *testing.T) {
158151
client, server := mockNetwork1()
159152
defer server.Close()
160153
conn, err := NewConnectionFull(client, serverConfig, krb5test.Credential(),
161-
l, clock)
154+
clock)
162155
if err != nil {
163156
t.Fatal(err)
164157
}
@@ -180,8 +173,6 @@ func TestConnectionSendNotice(t *testing.T) {
180173
}
181174

182175
func TestConnectionSendNoticeRetransmit(t *testing.T) {
183-
l, lc := expectNoLogs(t)
184-
defer lc.Close()
185176
ctx, err := krb5.NewContext()
186177
if err != nil {
187178
t.Fatal(err)
@@ -193,7 +184,7 @@ func TestConnectionSendNoticeRetransmit(t *testing.T) {
193184
client, server := mockNetwork1()
194185
defer server.Close()
195186
conn, err := NewConnectionFull(client, serverConfig, krb5test.Credential(),
196-
l, clock)
187+
clock)
197188
if err != nil {
198189
t.Fatal(err)
199190
}
@@ -215,8 +206,6 @@ func TestConnectionSendNoticeRetransmit(t *testing.T) {
215206
}
216207

217208
func TestConnectionSendNoticeTimeout(t *testing.T) {
218-
l, lc := expectNoLogs(t)
219-
defer lc.Close()
220209
ctx, err := krb5.NewContext()
221210
if err != nil {
222211
t.Fatal(err)
@@ -228,7 +217,7 @@ func TestConnectionSendNoticeTimeout(t *testing.T) {
228217
client, server := mockNetwork1()
229218
defer server.Close()
230219
conn, err := NewConnectionFull(client, serverConfig, krb5test.Credential(),
231-
l, clock)
220+
clock)
232221
if err != nil {
233222
t.Fatal(err)
234223
}
@@ -244,14 +233,12 @@ func TestConnectionSendNoticeTimeout(t *testing.T) {
244233
}
245234

246235
func TestConnectionSendNoticeUnauth(t *testing.T) {
247-
l, lc := expectNoLogs(t)
248-
defer lc.Close()
249236
notice := sampleNotice()
250237
clock := zephyrtest.NewMockClock()
251238
client, server := mockNetwork1()
252239
defer server.Close()
253240
conn, err := NewConnectionFull(client, serverConfig, krb5test.Credential(),
254-
l, clock)
241+
clock)
255242
if err != nil {
256243
t.Fatal(err)
257244
}
@@ -273,8 +260,6 @@ func TestConnectionSendNoticeUnauth(t *testing.T) {
273260
}
274261

275262
func TestConnectionSendNoticeUnacked(t *testing.T) {
276-
l, lc := expectNoLogs(t)
277-
defer lc.Close()
278263
ctx, err := krb5.NewContext()
279264
if err != nil {
280265
t.Fatal(err)
@@ -287,7 +272,7 @@ func TestConnectionSendNoticeUnacked(t *testing.T) {
287272
client, server := mockNetwork1()
288273
defer server.Close()
289274
conn, err := NewConnectionFull(client, serverConfig, krb5test.Credential(),
290-
l, clock)
275+
clock)
291276
if err != nil {
292277
t.Fatal(err)
293278
}
@@ -306,8 +291,6 @@ func TestConnectionSendNoticeUnacked(t *testing.T) {
306291
}
307292

308293
func TestConnectionSendNoticeRoundRobin(t *testing.T) {
309-
l, lc := expectNoLogs(t)
310-
defer lc.Close()
311294
ctx, err := krb5.NewContext()
312295
if err != nil {
313296
t.Fatal(err)
@@ -320,7 +303,7 @@ func TestConnectionSendNoticeRoundRobin(t *testing.T) {
320303
defer server1.Close()
321304
defer server2.Close()
322305
conn, err := NewConnectionFull(client, serverConfigFull, krb5test.Credential(),
323-
l, clock)
306+
clock)
324307
if err != nil {
325308
t.Fatal(err)
326309
}
@@ -363,8 +346,6 @@ func serverConfigNeedRefresh() ServerConfig {
363346
}
364347

365348
func TestConnectionSendNoticeNeedRefresh(t *testing.T) {
366-
l, lc := expectNoLogs(t)
367-
defer lc.Close()
368349
ctx, err := krb5.NewContext()
369350
if err != nil {
370351
t.Fatal(err)
@@ -377,7 +358,7 @@ func TestConnectionSendNoticeNeedRefresh(t *testing.T) {
377358
defer server1.Close()
378359
defer server2.Close()
379360
conn, err := NewConnectionFull(client, serverConfigNeedRefresh(),
380-
krb5test.Credential(), l, clock)
361+
krb5test.Credential(), clock)
381362
if err != nil {
382363
t.Fatal(err)
383364
}
@@ -406,15 +387,13 @@ func TestConnectionSendNoticeNeedRefresh(t *testing.T) {
406387
}
407388

408389
func TestConnectionSendNoticeWriteFailure(t *testing.T) {
409-
l, lc := expectNoLogs(t)
410-
defer lc.Close()
411390
notice := sampleNotice()
412391
clock := zephyrtest.NewMockClock()
413392
readChan := make(chan zephyrtest.PacketRead)
414393
close(readChan)
415394
mock := zephyrtest.NewMockPacketConn(clientAddr, readChan)
416395
conn, err := NewConnectionFull(mock, serverConfig, krb5test.Credential(),
417-
l, clock)
396+
clock)
418397
if err != nil {
419398
t.Fatal(err)
420399
}
@@ -435,16 +414,14 @@ func TestConnectionSendNoticeWriteFailure(t *testing.T) {
435414
}
436415

437416
func TestConnectionSendGiantNotices(t *testing.T) {
438-
l, lc := expectNoLogs(t)
439-
defer lc.Close()
440417
notice := sampleNotice()
441418
notice.RawBody = make([]byte, 99999)
442419

443420
clock := zephyrtest.NewMockClock()
444421
client, server := mockNetwork1()
445422
defer server.Close()
446423
conn, err := NewConnectionFull(client, serverConfig, krb5test.Credential(),
447-
l, clock)
424+
clock)
448425
if err != nil {
449426
t.Fatal(err)
450427
}
@@ -464,14 +441,12 @@ func (sc signalingConfig) ResolveServer() ([]*net.UDPAddr, error) {
464441
}
465442

466443
func TestConnectionPeriodicRefresh(t *testing.T) {
467-
l, lc := expectNoLogs(t)
468-
defer lc.Close()
469444
config := signalingConfig(make(chan int, 2))
470445

471446
clock := zephyrtest.NewMockClock()
472447
client, server := mockNetwork1()
473448
defer server.Close()
474-
conn, err := NewConnectionFull(client, config, krb5test.Credential(), l, clock)
449+
conn, err := NewConnectionFull(client, config, krb5test.Credential(), clock)
475450
if err != nil {
476451
t.Fatal(err)
477452
}
@@ -509,8 +484,6 @@ func (f *failingConfig) ResolveServer() ([]*net.UDPAddr, error) {
509484
}
510485

511486
func TestConnectionFailingConfigMidSend(t *testing.T) {
512-
l, lc := expectNoLogs(t)
513-
defer lc.Close()
514487
ctx, err := krb5.NewContext()
515488
if err != nil {
516489
t.Fatal(err)
@@ -524,7 +497,7 @@ func TestConnectionFailingConfigMidSend(t *testing.T) {
524497
defer server2.Close()
525498
conn, err := NewConnectionFull(client,
526499
newFailingConfig(1, serverConfigNeedRefresh()),
527-
krb5test.Credential(), l, clock)
500+
krb5test.Credential(), clock)
528501
if err != nil {
529502
t.Fatal(err)
530503
}

‎log_util.go

-46
This file was deleted.

‎message_test.go

+4-12
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ func testSendMessage(t *testing.T, l int, auth AuthStatus) {
3737

3838
msg := &Message{sampleNotice().Header, body}
3939

40-
logger, lc := expectNoLogs(t)
41-
defer lc.Close()
4240
ctx, err := krb5.NewContext()
4341
if err != nil {
4442
t.Error(err)
@@ -49,7 +47,7 @@ func testSendMessage(t *testing.T, l int, auth AuthStatus) {
4947
clock := zephyrtest.NewMockClock()
5048
client, server := mockNetwork1()
5149
conn, err := NewConnectionFull(client, serverConfig,
52-
krb5test.Credential(), logger, clock)
50+
krb5test.Credential(), clock)
5351
if err != nil {
5452
t.Error(err)
5553
return
@@ -117,13 +115,11 @@ func TestSendMessage(t *testing.T) {
117115
}
118116

119117
func TestSendMessageLongHeader(t *testing.T) {
120-
l, lc := expectNoLogs(t)
121-
defer lc.Close()
122118
clock := zephyrtest.NewMockClock()
123119
client, server := mockNetwork1()
124120
defer server.Close()
125121
conn, err := NewConnectionFull(client, serverConfig,
126-
krb5test.Credential(), l, clock)
122+
krb5test.Credential(), clock)
127123
if err != nil {
128124
t.Fatal(err)
129125
}
@@ -143,13 +139,11 @@ func TestSendMessageLongHeader(t *testing.T) {
143139
}
144140

145141
func TestSendMessageNack(t *testing.T) {
146-
l, lc := expectNoLogs(t)
147-
defer lc.Close()
148142
clock := zephyrtest.NewMockClock()
149143
client, server := mockNetwork1()
150144
defer server.Close()
151145
conn, err := NewConnectionFull(client, serverConfig,
152-
krb5test.Credential(), l, clock)
146+
krb5test.Credential(), clock)
153147
if err != nil {
154148
t.Fatal(err)
155149
}
@@ -175,14 +169,12 @@ func TestSendMessageNack(t *testing.T) {
175169
}
176170

177171
func TestSendMessageSendError(t *testing.T) {
178-
l, lc := expectNoLogs(t)
179-
defer lc.Close()
180172
clock := zephyrtest.NewMockClock()
181173
readChan := make(chan zephyrtest.PacketRead)
182174
close(readChan)
183175
mock := zephyrtest.NewMockPacketConn(clientAddr, readChan)
184176
conn, err := NewConnectionFull(mock, serverConfig,
185-
krb5test.Credential(), l, clock)
177+
krb5test.Credential(), clock)
186178
if err != nil {
187179
t.Fatal(err)
188180
}

0 commit comments

Comments
 (0)