Skip to content

Commit 88bca93

Browse files
aledbfroboquat
authored andcommitted
Fix workspace integration test suite and reduce log verbosity
1 parent 191a260 commit 88bca93

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

test/pkg/integration/workspace.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,13 @@ func LaunchWorkspaceDirectly(t *testing.T, ctx context.Context, api *ComponentAP
129129
return nil, nil, err
130130
}
131131

132-
t.Log("obtaining a lock to create a workspace")
133132
parallelLimiter <- struct{}{}
134133
defer func() {
135134
if err != nil && stopWs == nil {
136135
t.Log("unlock the parallelLimiter because of error during stating the workspace")
137136
<-parallelLimiter
138137
}
139138
}()
140-
t.Log("got the lock of parallelLimiter")
141139

142140
var workspaceImage string
143141
if options.BaseImage != "" {
@@ -337,12 +335,10 @@ func LaunchWorkspaceFromContextURL(t *testing.T, ctx context.Context, contextURL
337335
}
338336
}()
339337

340-
t.Log("prepare for a connection with gitpod server")
341338
server, err := api.GitpodServer(append(defaultServerOpts, serverOpts...)...)
342339
if err != nil {
343340
return nil, nil, xerrors.Errorf("cannot start server: %w", err)
344341
}
345-
t.Log("established a connection with gitpod server")
346342

347343
cctx, ccancel := context.WithTimeout(context.Background(), perCallTimeout)
348344
defer ccancel()
@@ -426,7 +422,6 @@ func stopWsF(t *testing.T, instanceID string, workspaceID string, api *Component
426422
if already {
427423
return
428424
} else {
429-
t.Log("unlock the parallelLimiter")
430425
<-parallelLimiter
431426
}
432427
already = true

test/tests/components/ws-daemon/cpu_burst_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
type DaemonConfig struct {
2727
CpuLimitConfig struct {
2828
Enabled bool `json:"enabled"`
29-
Limit int64 `json:"limit,string"`
30-
BurstLimit int64 `json:"burstLimit,string"`
29+
Limit int64 `json:"limit"`
30+
BurstLimit int64 `json:"burstLimit"`
3131
} `json:"cpuLimit"`
3232
}
3333

0 commit comments

Comments
 (0)