Skip to content

Commit

Permalink
Merge branch 'cherry-pick-c67edcf5' into 'ttv2_v0.3.8'
Browse files Browse the repository at this point in the history
Merge branch 'fix_nsqlookupd_ut' into '0.3.8'

See merge request nsq/nsq!33
  • Loading branch information
xiening committed Oct 31, 2018
2 parents 00b6846 + 97d8a15 commit cd964d9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions nsqlookupd/lookup_protocol_v1_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ func testIOLoopReturnsClientErr(t *testing.T, fakeConn test.FakeNetConn) {

prot := &LookupProtocolV1{ctx: &Context{nsqlookupd: New(opts)}}

prot.ctx.nsqlookupd.httpServer = newHTTPServer(&Context{prot.ctx.nsqlookupd})
errChan := make(chan error)
test := func() {
errChan <- prot.IOLoop(fakeConn)
Expand Down

0 comments on commit cd964d9

Please sign in to comment.