Increase verbosity for tests on CI: Inspect why

riotkit-org · Feb 25, 2021 · d7e88b1 · d7e88b1
1 parent 0980f25
commit d7e88b1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/tests/utils/base_docker_container_test.py b/tests/utils/base_docker_container_test.py
@@ -4,6 +4,8 @@
 import time
 from abc import abstractmethod
 
+from docker.models.containers import Container
+
 
 class BaseDockerContainerRequirement(object):
     docker_client: docker.DockerClient
@@ -24,7 +26,14 @@ def tearDownClass(cls) -> None:
     @classmethod
     def _remove_container(cls):
         try:
-            container = cls.docker_client.containers.get(cls._get_container_name())
+            container: Container = cls.docker_client.containers.get(cls._get_container_name())
+
+            # try to get logs if container crashed
+            try:
+                if container.status == 'exited':
+                    print(container.logs())
+            except:
+                pass
 
             try:
                 container.kill()

diff --git a/tests/utils/ssh_test.py b/tests/utils/ssh_test.py
@@ -9,13 +9,18 @@ class SSHServerContainerRequirement(BaseDockerContainerRequirement):
     def _wait_for_container_to_be_ready():
         out = ''
 
+        print('Spawning SSH container')
+
         for i in range(1, 600):
             try:
                 out += str(subprocess.check_output('echo "ttttt\n\n" | nc -w 1 "localhost" "3222"',
                                                    shell=True, stderr=subprocess.STDOUT))
 
                 if "SSH-2.0-OpenSSH" in out:
+                    print('SSH container is ready')
+                    time.sleep(1)
                     return
+
             except subprocess.CalledProcessError:
                 time.sleep(0.5)