From 207a8609dc876a462535cd899981df188cc1bf1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Wed, 8 Aug 2018 12:00:41 +0300
Subject: [PATCH] Use docker directly in NPM test runner

The checking of the container status should use docker directly.
---
 test/docker-compose.yml | 4 ++++
 test/run_npm_test.sh    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
index 0c5839c99..da79ca1cf 100644
--- a/test/docker-compose.yml
+++ b/test/docker-compose.yml
@@ -3,6 +3,7 @@ services:
     server1:
         image: mariadb:10.2
         network_mode: "host"
+        container_name: server1
         environment:
             MYSQL_ALLOW_EMPTY_PASSWORD: Y
         volumes:
@@ -11,6 +12,7 @@ services:
 
     server2:
         image: mariadb:10.2
+        container_name: server2
         network_mode: "host"
         environment:
             MYSQL_ALLOW_EMPTY_PASSWORD: Y
@@ -20,6 +22,7 @@ services:
 
     server3:
         image: mariadb:10.2
+        container_name: server3
         network_mode: "host"
         environment:
             MYSQL_ALLOW_EMPTY_PASSWORD: Y
@@ -29,6 +32,7 @@ services:
 
     server4:
         image: mariadb:10.2
+        container_name: server4
         network_mode: "host"
         environment:
             MYSQL_ALLOW_EMPTY_PASSWORD: Y
diff --git a/test/run_npm_test.sh b/test/run_npm_test.sh
index 49d32e6f5..fb39794d1 100755
--- a/test/run_npm_test.sh
+++ b/test/run_npm_test.sh
@@ -80,7 +80,7 @@ do
     printf "Waiting for $node to start... "
     for ((i=0; i<60; i++))
     do
-        docker-compose exec $node mysql -umaxuser -pmaxpwd -e "select 1" >& /dev/null && break
+        docker exec -ti $node mysql -umaxuser -pmaxpwd -e "select 1" >& /dev/null && break
         sleep 1
     done
     echo "Done!"