Linter fixes

This commit is contained in:
Jose Garcia 2021-09-23 11:56:41 -04:00
parent 958990cef8
commit fb53ccb06a
3 changed files with 12 additions and 12 deletions

View file

@ -22,7 +22,7 @@ func TestConnect(t *testing.T) {
joinWorkspace := func(req *jsonrpc2.Request) (interface{}, error) {
var joinWorkspaceReq joinWorkspaceArgs
if err := json.Unmarshal(*req.Params, &joinWorkspaceReq); err != nil {
return nil, fmt.Errorf("error unmarshaling req: %v", err)
return nil, fmt.Errorf("error unmarshaling req: %w", err)
}
if joinWorkspaceReq.ID != opts.SessionID {
return nil, errors.New("connection session id does not match")
@ -45,7 +45,7 @@ func TestConnect(t *testing.T) {
livesharetest.WithRelaySAS(opts.RelaySAS),
)
if err != nil {
t.Errorf("error creating Live Share server: %v", err)
t.Errorf("error creating Live Share server: %w", err)
}
defer server.Close()
opts.RelayEndpoint = "sb" + strings.TrimPrefix(server.URL(), "https")
@ -62,10 +62,10 @@ func TestConnect(t *testing.T) {
select {
case err := <-server.Err():
t.Errorf("error from server: %v", err)
t.Errorf("error from server: %w", err)
case err := <-done:
if err != nil {
t.Errorf("error from client: %v", err)
t.Errorf("error from client: %w", err)
}
}
}

View file

@ -17,7 +17,7 @@ import (
func TestNewPortForwarder(t *testing.T) {
testServer, session, err := makeMockSession()
if err != nil {
t.Errorf("create mock client: %v", err)
t.Errorf("create mock client: %w", err)
}
defer testServer.Close()
pf := NewPortForwarder(session, "ssh", 80)
@ -42,7 +42,7 @@ func TestPortForwarderStart(t *testing.T) {
livesharetest.WithStream("stream-id", stream),
)
if err != nil {
t.Errorf("create mock session: %v", err)
t.Errorf("create mock session: %w", err)
}
defer testServer.Close()
@ -73,23 +73,23 @@ func TestPortForwarderStart(t *testing.T) {
}
b := make([]byte, len("stream-data"))
if _, err := conn.Read(b); err != nil && err != io.EOF {
done <- fmt.Errorf("reading stream: %v", err)
done <- fmt.Errorf("reading stream: %w", err)
}
if string(b) != "stream-data" {
done <- fmt.Errorf("stream data is not expected value, got: %v", string(b))
done <- fmt.Errorf("stream data is not expected value, got: %s", string(b))
}
if _, err := conn.Write([]byte("new-data")); err != nil {
done <- fmt.Errorf("writing to stream: %v", err)
done <- fmt.Errorf("writing to stream: %w", err)
}
done <- nil
}()
select {
case err := <-testServer.Err():
t.Errorf("error from server: %v", err)
t.Errorf("error from server: %w", err)
case err := <-done:
if err != nil {
t.Errorf("error from client: %v", err)
t.Errorf("error from client: %w", err)
}
}
}

View file

@ -59,7 +59,7 @@ func (s *socketConn) Write(b []byte) (int, error) {
n, err := w.Write(b)
if err != nil {
return 0, fmt.Errorf("error writing: %v", err)
return 0, fmt.Errorf("error writing: %w", err)
}
if err := w.Close(); err != nil {