From 318deb337e996787590fa6985b6bf5e3cd43753a Mon Sep 17 00:00:00 2001
From: Greg Meyer <gregory.meyer@datadoghq.com>
Date: Tue, 29 May 2018 04:51:43 -0400
Subject: [PATCH] Increase the timeout in the containers (#1547)

* increase wait time

* increase logging
---
 mysql/tests/compose/maria.yaml |  2 +-
 mysql/tests/compose/mysql.yaml |  4 ++--
 mysql/tests/conftest.py        | 17 ++++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/mysql/tests/compose/maria.yaml b/mysql/tests/compose/maria.yaml
index 813e2db05c579..aabbe9010e21a 100644
--- a/mysql/tests/compose/maria.yaml
+++ b/mysql/tests/compose/maria.yaml
@@ -50,7 +50,7 @@ services:
       - ${WAIT_FOR_IT_SCRIPT_PATH}:/usr/local/bin/wait-for-it.sh
     depends_on:
       - "mysql-slave"
-    command: ["wait-for-it.sh", "mysql-master:3306", "-t", "30", "--", "setup_mysql.sh"]
+    command: ["wait-for-it.sh", "mysql-master:3306", "-t", "120", "--", "setup_mysql.sh"]
 
 
 networks:
diff --git a/mysql/tests/compose/mysql.yaml b/mysql/tests/compose/mysql.yaml
index bebfa62302c9e..2859014d9cf0a 100644
--- a/mysql/tests/compose/mysql.yaml
+++ b/mysql/tests/compose/mysql.yaml
@@ -22,7 +22,7 @@ services:
       - ${WAIT_FOR_IT_SCRIPT_PATH}:/usr/local/bin/wait-for-it.sh
     networks:
       - network1
-    command: ["wait-for-it.sh", "mysql-master:3306", "-t", "30", "--", "replication-entrypoint.sh", "mysqld"]
+    command: ["wait-for-it.sh", "mysql-master:3306", "-t", "120", "--", "replication-entrypoint.sh", "mysqld"]
     depends_on:
       - "mysql-master"
 
@@ -37,7 +37,7 @@ services:
       - ${WAIT_FOR_IT_SCRIPT_PATH}:/usr/local/bin/wait-for-it.sh
     depends_on:
       - "mysql-slave"
-    command: ["wait-for-it.sh", "mysql-master:3306", "-t", "30", "--", "setup_mysql.sh"]
+    command: ["wait-for-it.sh", "mysql-master:3306", "-t", "120", "--", "setup_mysql.sh"]
 
 
 networks:
diff --git a/mysql/tests/conftest.py b/mysql/tests/conftest.py
index a11571c6e06ad..d161fcb8de69e 100644
--- a/mysql/tests/conftest.py
+++ b/mysql/tests/conftest.py
@@ -19,7 +19,7 @@ def wait_for_mysql():
     Wait for the slave to connect to the master
     """
     connected = False
-    for i in xrange(0, 50):
+    for i in xrange(0, 100):
         try:
             pymysql.connect(
                 host=common.HOST,
@@ -38,8 +38,7 @@ def wait_for_mysql():
             connected = True
             return True
         except Exception as e:
-            pass
-            log.debug("exception: {0}".format(e))
+            log.debug("exception: {}".format(e))
             time.sleep(2)
 
     return connected
@@ -70,6 +69,18 @@ def spin_up_mysql():
     subprocess.check_call(args + ["up", "-d"], env=env)
     # wait for the cluster to be up before yielding
     if not wait_for_mysql():
+        containers = [
+            "compose_mysql-master_1",
+            "compose_mysql-slave_1",
+            "compose_mysql-setup_1",
+        ]
+        for container in containers:
+            args = [
+                "docker",
+                "logs",
+                container,
+            ]
+            subprocess.check_call(args, env=env)
         raise Exception("not working")
     yield
     subprocess.check_call(args + ["down"], env=env)