Updates based on feedback

Signed-off-by: Derek Collison <derek@nats.io>
This commit is contained in:
Derek Collison
2020-06-30 18:02:49 -07:00
parent 06ca580334
commit 439e090e0d
3 changed files with 12 additions and 11 deletions

View File

@@ -732,9 +732,9 @@ func TestNoRaceSlowProxy(t *testing.T) {
bwTarget := 10 * 1024 * 1024 / 8 // 10mbit
sp := newSlowProxy(rttTarget, bwTarget, bwTarget, &opts)
defer sp.Stop()
defer sp.stop()
nc, err := nats.Connect(sp.ClientURL())
nc, err := nats.Connect(sp.clientURL())
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}

View File

@@ -342,9 +342,9 @@ func TestServiceLatencyClientRTTSlowerVsServiceRTT(t *testing.T) {
rtt := 10 * time.Millisecond
bw := 1024 * 1024
sp := newSlowProxy(rtt+5*time.Millisecond, bw, bw, sopts)
defer sp.Stop()
defer sp.stop()
nc2 := clientConnect(t, sp.Opts(), "bar")
nc2 := clientConnect(t, sp.opts(), "bar")
defer nc2.Close()
start := time.Now()

View File

@@ -47,7 +47,7 @@ func checkFor(t *testing.T, totalWait, sleepDur time.Duration, f func() error) {
type slowProxy struct {
listener net.Listener
conns []net.Conn
opts *server.Options
o *server.Options
u string
}
@@ -73,16 +73,17 @@ func newSlowProxy(rtt time.Duration, up, down int, opts *server.Options) *slowPr
go sp.loop(rtt, up, client, server)
go sp.loop(rtt, down, server, client)
}()
sp.opts = &server.Options{Host: "127.0.0.1", Port: port}
sp.u = fmt.Sprintf("nats://%s:%d", sp.opts.Host, sp.opts.Port)
sp.o = &server.Options{Host: "127.0.0.1", Port: port}
sp.u = fmt.Sprintf("nats://%s:%d", sp.o.Host, sp.o.Port)
return sp
}
func (sp *slowProxy) Opts() *server.Options {
return sp.opts
func (sp *slowProxy) opts() *server.Options {
return sp.o
}
func (sp *slowProxy) ClientURL() string {
//lint:ignore U1000 Referenced in norace_test.go
func (sp *slowProxy) clientURL() string {
return sp.u
}
@@ -114,7 +115,7 @@ func (sp *slowProxy) loop(rtt time.Duration, tbw int, r, w net.Conn) {
}
}
func (sp *slowProxy) Stop() {
func (sp *slowProxy) stop() {
if sp.listener != nil {
sp.listener.Close()
sp.listener = nil