Skip to content
Snippets Groups Projects
Unverified Commit 959ebacb authored by Steve Azzopardi's avatar Steve Azzopardi
Browse files

Clean up tests

Fix `Fail in goroutine after TestInteractiveTerminal has completed`
because of the assertion was in the goroutine.

Remove `TestInteractiveWebTerminalAttachStrategy` since it is not really
testing anything new.
parent 3484a1de
No related branches found
No related tags found
No related merge requests found
...@@ -52,8 +52,7 @@ func TestInteractiveTerminal(t *testing.T) { ...@@ -52,8 +52,7 @@ func TestInteractiveTerminal(t *testing.T) {
// Start build // Start build
buildLogWriter := bytes.NewBuffer(nil) buildLogWriter := bytes.NewBuffer(nil)
go func() { go func() {
err = build.Run(&common.Config{}, &common.Trace{Writer: buildLogWriter}) _ = build.Run(&common.Config{}, &common.Trace{Writer: buildLogWriter})
require.NoError(t, err)
}() }()
buildStarted := make(chan struct{}) buildStarted := make(chan struct{})
...@@ -174,34 +173,3 @@ func TestCommandExecutor_Connect(t *testing.T) { ...@@ -174,34 +173,3 @@ func TestCommandExecutor_Connect(t *testing.T) {
assert.NotNil(t, conn) assert.NotNil(t, conn)
assert.IsType(t, terminalConn{}, conn) assert.IsType(t, terminalConn{}, conn)
} }
func TestInteractiveWebTerminalAttachStrategy(t *testing.T) {
if helpers.SkipIntegrationTests(t, "docker", "info") {
return
}
successfulBuild, err := common.GetRemoteSuccessfulBuild()
assert.NoError(t, err)
sess, err := session.NewSession(nil)
require.NoError(t, err)
build := &common.Build{
JobResponse: successfulBuild,
Runner: &common.RunnerConfig{
RunnerSettings: common.RunnerSettings{
Executor: "docker",
Docker: &common.DockerConfig{
Image: common.TestAlpineImage,
PullPolicy: common.PullPolicyIfNotPresent,
},
},
},
Session: sess,
}
err = build.Run(&common.Config{}, &common.Trace{Writer: os.Stdout})
require.NoError(t, err)
require.False(t, build.Session.Connected())
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment