diff --git a/session/server_test.go b/session/server_test.go index 118e982fce7280593e4b72e02a5019b722574909..09eabfe7fe71ddf4fab349cb9ceef4c4ee8c1b8e 100644 --- a/session/server_test.go +++ b/session/server_test.go @@ -127,10 +127,10 @@ func TestFailedToGenerateCertificate(t *testing.T) { ListenAddress: "127.0.0.1:0", } - m := certificate.MockGenerator{} + m := new(certificate.MockGenerator) defer m.AssertExpectations(t) m.On("Generate", mock.Anything).Return(tls.Certificate{}, []byte{}, errors.New("something went wrong")) - _, err := NewServer(cfg, nil, &m, fakeSessionFinder) + _, err := NewServer(cfg, nil, m, fakeSessionFinder) assert.Error(t, err, "something went wrong") } diff --git a/session/session_test.go b/session/session_test.go index adcab2b7f78d27f1d4e5077d23261e2298958d22..b090ed4077592fcf03432a8a576b06d0247654de 100644 --- a/session/session_test.go +++ b/session/session_test.go @@ -64,7 +64,7 @@ func TestExec(t *testing.T) { require.NoError(t, err) session.Token = "validToken" - mockTerminalConn := terminal.MockConn{} + mockTerminalConn := new(terminal.MockConn) defer mockTerminalConn.AssertExpectations(t) if c.connectionErr == nil && c.authorization == "validToken" && c.isWebsocketUpgrade { @@ -72,15 +72,15 @@ func TestExec(t *testing.T) { mockTerminalConn.On("Close").Return(nil).Once() } - mockTerminal := terminal.MockInteractiveTerminal{} + mockTerminal := new(terminal.MockInteractiveTerminal) defer mockTerminal.AssertExpectations(t) if c.authorization == "validToken" && c.isWebsocketUpgrade { - mockTerminal.On("Connect").Return(&mockTerminalConn, c.connectionErr).Once() + mockTerminal.On("Connect").Return(mockTerminalConn, c.connectionErr).Once() } if c.attachTerminal { - session.SetInteractiveTerminal(&mockTerminal) + session.SetInteractiveTerminal(mockTerminal) } req := httptest.NewRequest(http.MethodPost, session.Endpoint+"/exec", nil) @@ -107,14 +107,14 @@ func TestDoNotAllowMultipleConnections(t *testing.T) { require.NoError(t, err) session.Token = "validToken" - mockTerminalConn := terminal.MockConn{} + mockTerminalConn := new(terminal.MockConn) defer mockTerminalConn.AssertExpectations(t) - mockTerminal := terminal.MockInteractiveTerminal{} + mockTerminal := new(terminal.MockInteractiveTerminal) defer mockTerminal.AssertExpectations(t) - mockTerminal.On("Connect").Return(&mockTerminalConn, nil).Once() + mockTerminal.On("Connect").Return(mockTerminalConn, nil).Once() - session.SetInteractiveTerminal(&mockTerminal) + session.SetInteractiveTerminal(mockTerminal) // Simulating another connection has already started. conn, err := session.newTerminalConn() @@ -149,11 +149,11 @@ func TestKill(t *testing.T) { err = sess.Kill() assert.NoError(t, err) - mockConn := terminal.MockConn{} + mockConn := new(terminal.MockConn) defer mockConn.AssertExpectations(t) mockConn.On("Close").Return(nil).Once() - sess.terminalConn = &mockConn + sess.terminalConn = mockConn err = sess.Kill() assert.NoError(t, err) @@ -164,11 +164,11 @@ func TestKillFailedToClose(t *testing.T) { sess, err := NewSession(nil) require.NoError(t, err) - mockConn := terminal.MockConn{} + mockConn := new(terminal.MockConn) defer mockConn.AssertExpectations(t) mockConn.On("Close").Return(errors.New("some error")).Once() - sess.terminalConn = &mockConn + sess.terminalConn = mockConn err = sess.Kill() assert.Error(t, err)