Fixed SQLREPLTestSuite

Signed-off-by: Lou Marvin Caraig <[email protected]>

Author: se7entyse7en

cmdtests/sql_test.go

@@ -17,8 +17,6 @@ import (
 
 	"github.com/kr/pty"
 	"github.com/src-d/engine/cmdtests"
-	"github.com/src-d/engine/components"
-	"github.com/src-d/engine/docker"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
@@ -92,7 +90,6 @@ func (s *SQLREPLTestSuite) TestInteractiveREPL() {
 	require.Contains(res, showRepoTableDescOutput)
 
 	require.NoError(s.exitInteractiveAndWait(10*time.Second, in, out))
-	require.NoError(s.waitMysqlCliContainerStopped(10, 1*time.Second))
 
 	command.Wait()
 }
@@ -116,8 +113,9 @@ func (s *SQLREPLTestSuite) runInteractiveRepl() (*exec.Cmd, io.Writer, <-chan st
 
 	linifier := cmdtests.NewStreamLinifier(1 * time.Second)
 	out := linifier.Linify(ch)
+
 	for s := range out {
-		if strings.HasPrefix(s, "mysql>") {
+		if strings.Contains(s, "MySQL [(none)]>") {
 			return command, in, out, nil
 		}
 	}
@@ -164,23 +162,6 @@ func (s *SQLREPLTestSuite) exitInteractiveAndWait(timeout time.Duration, in io.W
 	}
 }
 
-func (s *SQLREPLTestSuite) waitMysqlCliContainerStopped(retries int, retryTimeout time.Duration) error {
-	for i := 0; i < retries; i++ {
-		running, err := docker.IsRunning(components.MysqlCli.Name, "")
-		if !running {
-			return nil
-		}
-
-		if err != nil {
-			return err
-		}
-
-		time.Sleep(retryTimeout)
-	}
-
-	return fmt.Errorf("maximum number of retries (%d) reached while waiting to stop container", retries)
-}
-
 // containsSQLOutput returns `true` if the given string is a SQL output table.
 // To detect whether the `out` is a SQL output table, this checks that there
 // are exactly 3 separators matching this regex ``\+-+\+`.