Skip to content
Snippets Groups Projects
Unverified Commit 1c1db4ab authored by Tomasz Maczukin's avatar Tomasz Maczukin
Browse files

Add missing AssertExpectations on mocks in session package

parent d178db15
No related branches found
No related tags found
No related merge requests found
...@@ -128,6 +128,7 @@ func TestFailedToGenerateCertificate(t *testing.T) { ...@@ -128,6 +128,7 @@ func TestFailedToGenerateCertificate(t *testing.T) {
} }
m := certificate.MockGenerator{} m := certificate.MockGenerator{}
defer m.AssertExpectations(t)
m.On("Generate", mock.Anything).Return(tls.Certificate{}, []byte{}, errors.New("something went wrong")) 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)
......
...@@ -65,11 +65,19 @@ func TestExec(t *testing.T) { ...@@ -65,11 +65,19 @@ func TestExec(t *testing.T) {
session.Token = "validToken" session.Token = "validToken"
mockTerminalConn := terminal.MockConn{} mockTerminalConn := terminal.MockConn{}
mockTerminalConn.On("Start", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Once() defer mockTerminalConn.AssertExpectations(t)
mockTerminalConn.On("Close").Return(nil).Once()
if c.connectionErr == nil && c.authorization == "validToken" && c.isWebsocketUpgrade {
mockTerminalConn.On("Start", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Once()
mockTerminalConn.On("Close").Return(nil).Once()
}
mockTerminal := terminal.MockInteractiveTerminal{} mockTerminal := terminal.MockInteractiveTerminal{}
mockTerminal.On("Connect").Return(&mockTerminalConn, c.connectionErr).Once() defer mockTerminal.AssertExpectations(t)
if c.authorization == "validToken" && c.isWebsocketUpgrade {
mockTerminal.On("Connect").Return(&mockTerminalConn, c.connectionErr).Once()
}
if c.attachTerminal { if c.attachTerminal {
session.SetInteractiveTerminal(&mockTerminal) session.SetInteractiveTerminal(&mockTerminal)
...@@ -100,10 +108,10 @@ func TestDoNotAllowMultipleConnections(t *testing.T) { ...@@ -100,10 +108,10 @@ func TestDoNotAllowMultipleConnections(t *testing.T) {
session.Token = "validToken" session.Token = "validToken"
mockTerminalConn := terminal.MockConn{} mockTerminalConn := terminal.MockConn{}
mockTerminalConn.On("Start", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Once() defer mockTerminalConn.AssertExpectations(t)
mockTerminalConn.On("Close").Return().Once()
mockTerminal := terminal.MockInteractiveTerminal{} mockTerminal := 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)
...@@ -142,6 +150,7 @@ func TestKill(t *testing.T) { ...@@ -142,6 +150,7 @@ func TestKill(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
mockConn := terminal.MockConn{} mockConn := terminal.MockConn{}
defer mockConn.AssertExpectations(t)
mockConn.On("Close").Return(nil).Once() mockConn.On("Close").Return(nil).Once()
sess.terminalConn = &mockConn sess.terminalConn = &mockConn
...@@ -156,6 +165,7 @@ func TestKillFailedToClose(t *testing.T) { ...@@ -156,6 +165,7 @@ func TestKillFailedToClose(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
mockConn := terminal.MockConn{} mockConn := terminal.MockConn{}
defer mockConn.AssertExpectations(t)
mockConn.On("Close").Return(errors.New("some error")).Once() mockConn.On("Close").Return(errors.New("some error")).Once()
sess.terminalConn = &mockConn sess.terminalConn = &mockConn
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment