epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove UserGet call in tests since it's note required for anon sessions

Browse Source 
Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>
This commit is contained in:
Marcos Lilljedahl
2020-10-03 10:01:44 -03:00
parent 58a3432a4e
commit 7fadf5bad7
4 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pwd/client_test.go
View File

@@ -33,7 +33,6 @@ func TestClientNew(t *testing.T) {
_d.On("DaemonHost").Return("localhost") _d.On("DaemonHost").Return("localhost")
_d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil) _d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil)
_s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil) _s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil)
_s.On("UserGet", mock.Anything).Return(&types.User{}, nil)
_s.On("SessionCount").Return(1, nil) _s.On("SessionCount").Return(1, nil)
_s.On("InstanceCount").Return(0, nil) _s.On("InstanceCount").Return(0, nil)
_s.On("ClientCount").Return(1, nil) _s.On("ClientCount").Return(1, nil)
@@ -77,7 +76,6 @@ func TestClientCount(t *testing.T) {
_d.On("DaemonHost").Return("localhost") _d.On("DaemonHost").Return("localhost")
_d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil) _d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil)
_s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil) _s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil)
_s.On("UserGet", mock.Anything).Return(&types.User{}, nil)
_s.On("ClientPut", mock.AnythingOfType("*types.Client")).Return(nil) _s.On("ClientPut", mock.AnythingOfType("*types.Client")).Return(nil)
_s.On("ClientCount").Return(1, nil) _s.On("ClientCount").Return(1, nil)
_s.On("SessionCount").Return(1, nil) _s.On("SessionCount").Return(1, nil)
@@ -120,7 +118,6 @@ func TestClientResizeViewPort(t *testing.T) {
_d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil) _d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil)
_s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil) _s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil)
_s.On("SessionCount").Return(1, nil) _s.On("SessionCount").Return(1, nil)
_s.On("UserGet", mock.Anything).Return(&types.User{}, nil)
_s.On("InstanceCount").Return(0, nil) _s.On("InstanceCount").Return(0, nil)
_s.On("InstanceFindBySessionId", "aaaabbbbcccc").Return([]*types.Instance{}, nil) _s.On("InstanceFindBySessionId", "aaaabbbbcccc").Return([]*types.Instance{}, nil)
_s.On("ClientPut", mock.AnythingOfType("*types.Client")).Return(nil) _s.On("ClientPut", mock.AnythingOfType("*types.Client")).Return(nil)

3
pwd/instance_test.go
View File

@@ -61,7 +61,6 @@ func TestInstanceNew(t *testing.T) {
_d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil) _d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil)
_s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil) _s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil)
_s.On("SessionCount").Return(1, nil) _s.On("SessionCount").Return(1, nil)
_s.On("UserGet", mock.Anything).Return(&types.User{}, nil)
_s.On("ClientCount").Return(0, nil) _s.On("ClientCount").Return(0, nil)
_s.On("InstanceCount").Return(0, nil) _s.On("InstanceCount").Return(0, nil)
_s.On("InstanceFindBySessionId", "aaaabbbbcccc").Return([]*types.Instance{}, nil) _s.On("InstanceFindBySessionId", "aaaabbbbcccc").Return([]*types.Instance{}, nil)
@@ -135,7 +134,6 @@ func TestInstanceNew_WithNotAllowedImage(t *testing.T) {
_d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil) _d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil)
_s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil) _s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil)
_s.On("SessionCount").Return(1, nil) _s.On("SessionCount").Return(1, nil)
_s.On("UserGet", mock.Anything).Return(&types.User{}, nil)
_s.On("ClientCount").Return(0, nil) _s.On("ClientCount").Return(0, nil)
_s.On("InstanceCount").Return(0, nil) _s.On("InstanceCount").Return(0, nil)
_s.On("InstanceFindBySessionId", "aaaabbbbcccc").Return([]*types.Instance{}, nil) _s.On("InstanceFindBySessionId", "aaaabbbbcccc").Return([]*types.Instance{}, nil)
@@ -216,7 +214,6 @@ func TestInstanceNew_WithCustomHostname(t *testing.T) {
_d.On("DaemonHost").Return("localhost") _d.On("DaemonHost").Return("localhost")
_d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil) _d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil)
_s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil) _s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil)
_s.On("UserGet", mock.Anything).Return(&types.User{}, nil)
_s.On("SessionCount").Return(1, nil) _s.On("SessionCount").Return(1, nil)
_s.On("ClientCount").Return(0, nil) _s.On("ClientCount").Return(0, nil)
_s.On("InstanceCount").Return(0, nil) _s.On("InstanceCount").Return(0, nil)

1
pwd/session.go
View File

@@ -64,7 +64,6 @@ func (p *pwd) SessionNew(ctx context.Context, config types.SessionConfig) (*type
// Annonymous users should be also allowed to login // Annonymous users should be also allowed to login
if config.UserId != "" { if config.UserId != "" {
if _, err := p.UserGet(config.UserId); errors.Is(err, userBannedError) { if _, err := p.UserGet(config.UserId); errors.Is(err, userBannedError) {
return nil, &AccessDeniedError{err} return nil, &AccessDeniedError{err}
} else if err != nil { } else if err != nil {
return nil, err return nil, err

1
pwd/session_test.go
View File

@@ -36,7 +36,6 @@ func TestSessionNew(t *testing.T) {
_d.On("DaemonHost").Return("localhost") _d.On("DaemonHost").Return("localhost")
_d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil) _d.On("NetworkConnect", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil)
_s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil) _s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil)
_s.On("UserGet", mock.Anything).Return(&types.User{}, nil)
_s.On("SessionCount").Return(1, nil) _s.On("SessionCount").Return(1, nil)
_s.On("InstanceCount").Return(0, nil) _s.On("InstanceCount").Return(0, nil)
_s.On("ClientCount").Return(0, nil) _s.On("ClientCount").Return(0, nil)