From ef8ff4a9f3760a5cbb72399e3e60a015c4dc4f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Sun, 21 Jun 2015 23:11:02 +0200 Subject: [PATCH 1/2] update do_version_check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- tests/1_host_configuration.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/1_host_configuration.sh b/tests/1_host_configuration.sh index d97a1ba..9d0b72d 100644 --- a/tests/1_host_configuration.sh +++ b/tests/1_host_configuration.sh @@ -40,9 +40,11 @@ fi # 1.6 check_1_6="1.6 - Keep Docker up to date" docker_version=$(docker version | grep 'Server version' | awk '{print $3}') -do_version_check 1.6.2 $docker_version +docker_current_version="1.7.0" +do_version_check "$docker_current_version" "$docker_version" if [ $? -eq 11 ]; then warn "$check_1_6" + warn " * Using $docker_version, when $docker_current_version is current." else pass "$check_1_6" fi From 2907078fd2285ebebd1241e947bc1298e7e5064a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Sun, 21 Jun 2015 23:11:23 +0200 Subject: [PATCH 2/2] actually catch ssh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- tests/5_container_runtime.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/5_container_runtime.sh b/tests/5_container_runtime.sh index 9f581bf..c6e6f66 100644 --- a/tests/5_container_runtime.sh +++ b/tests/5_container_runtime.sh @@ -180,7 +180,7 @@ else fi processes=$(docker exec "$c" ps -el 2>/dev/null | grep -c sshd | awk '{print $1}') - if [ $processes -gt 1 ]; then + if [ "$processes" -ge 1 ]; then # If it's the first container, fail the test if [ $fail -eq 0 ]; then warn "$check_5_7"