From 17c6262d2fb3ce963fccc0ddce289185b2165998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Wed, 28 Aug 2019 12:14:35 +0200 Subject: [PATCH] formating 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 | 1 - tests/3_docker_daemon_configuration_files.sh | 52 ++++++++++---------- tests/5_container_runtime.sh | 2 +- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/tests/1_host_configuration.sh b/tests/1_host_configuration.sh index 9947163..8d88303 100644 --- a/tests/1_host_configuration.sh +++ b/tests/1_host_configuration.sh @@ -478,4 +478,3 @@ check_1_2_end() { check_1_end() { endsectionjson } - diff --git a/tests/3_docker_daemon_configuration_files.sh b/tests/3_docker_daemon_configuration_files.sh index 3f488c3..ec440bb 100644 --- a/tests/3_docker_daemon_configuration_files.sh +++ b/tests/3_docker_daemon_configuration_files.sh @@ -299,13 +299,13 @@ check_3_10() { currentScore=$((currentScore + 1)) else warn "$check_3_10" - warn " * Wrong permissions for $tlscacert" + warn " * Wrong permissions for $tlscacert" resulttestjson "WARN" "Wrong permissions for $tlscacert" currentScore=$((currentScore - 1)) fi else info "$check_3_10" - info " * No TLS CA certificate found" + info " * No TLS CA certificate found" resulttestjson "INFO" "No TLS CA certificate found" currentScore=$((currentScore + 0)) fi @@ -331,13 +331,13 @@ check_3_11() { currentScore=$((currentScore + 1)) else warn "$check_3_11" - warn " * Wrong ownership for $tlscert" + warn " * Wrong ownership for $tlscert" resulttestjson "WARN" "Wrong ownership for $tlscert" currentScore=$((currentScore - 1)) fi else info "$check_3_11" - info " * No TLS Server certificate found" + info " * No TLS Server certificate found" resulttestjson "INFO" "No TLS Server certificate found" currentScore=$((currentScore + 0)) fi @@ -363,13 +363,13 @@ check_3_12() { currentScore=$((currentScore + 1)) else warn "$check_3_12" - warn " * Wrong permissions for $tlscert" + warn " * Wrong permissions for $tlscert" resulttestjson "WARN" "Wrong permissions for $tlscert" currentScore=$((currentScore - 1)) fi else info "$check_3_12" - info " * No TLS Server certificate found" + info " * No TLS Server certificate found" resulttestjson "INFO" "No TLS Server certificate found" currentScore=$((currentScore + 0)) fi @@ -395,13 +395,13 @@ check_3_13() { currentScore=$((currentScore + 1)) else warn "$check_3_13" - warn " * Wrong ownership for $tlskey" + warn " * Wrong ownership for $tlskey" resulttestjson "WARN" "Wrong ownership for $tlskey" currentScore=$((currentScore - 1)) fi else info "$check_3_13" - info " * No TLS Key found" + info " * No TLS Key found" resulttestjson "INFO" "No TLS Key found" currentScore=$((currentScore + 0)) fi @@ -427,13 +427,13 @@ check_3_14() { currentScore=$((currentScore + 1)) else warn "$check_3_14" - warn " * Wrong permissions for $tlskey" + warn " * Wrong permissions for $tlskey" resulttestjson "WARN" "Wrong permissions for $tlskey" currentScore=$((currentScore - 1)) fi else info "$check_3_14" - info " * No TLS Key found" + info " * No TLS Key found" resulttestjson "INFO" "No TLS Key found" currentScore=$((currentScore + 0)) fi @@ -455,13 +455,13 @@ check_3_15() { currentScore=$((currentScore + 1)) else warn "$check_3_15" - warn " * Wrong ownership for $file" + warn " * Wrong ownership for $file" resulttestjson "WARN" "Wrong ownership for $file" currentScore=$((currentScore - 1)) fi else info "$check_3_15" - info " * File not found" + info " * File not found" resulttestjson "INFO" "File not found" currentScore=$((currentScore + 0)) fi @@ -483,13 +483,13 @@ check_3_16() { currentScore=$((currentScore + 1)) else warn "$check_3_16" - warn " * Wrong permissions for $file" + warn " * Wrong permissions for $file" resulttestjson "WARN" "Wrong permissions for $file" currentScore=$((currentScore - 1)) fi else info "$check_3_16" - info " * File not found" + info " * File not found" resulttestjson "INFO" "File not found" currentScore=$((currentScore + 0)) fi @@ -511,13 +511,13 @@ check_3_17() { currentScore=$((currentScore + 1)) else warn "$check_3_17" - warn " * Wrong ownership for $file" + warn " * Wrong ownership for $file" resulttestjson "WARN" "Wrong ownership for $file" currentScore=$((currentScore - 1)) fi else info "$check_3_17" - info " * File not found" + info " * File not found" resulttestjson "INFO" "File not found" currentScore=$((currentScore + 0)) fi @@ -539,13 +539,13 @@ check_3_18() { currentScore=$((currentScore + 1)) else warn "$check_3_18" - warn " * Wrong permissions for $file" + warn " * Wrong permissions for $file" resulttestjson "WARN" "Wrong permissions for $file" currentScore=$((currentScore - 1)) fi else info "$check_3_18" - info " * File not found" + info " * File not found" resulttestjson "INFO" "File not found" currentScore=$((currentScore + 0)) fi @@ -567,13 +567,13 @@ check_3_19() { currentScore=$((currentScore + 1)) else warn "$check_3_19" - warn " * Wrong ownership for $file" + warn " * Wrong ownership for $file" resulttestjson "WARN" "Wrong ownership for $file" currentScore=$((currentScore - 1)) fi else info "$check_3_19" - info " * File not found" + info " * File not found" resulttestjson "INFO" "File not found" currentScore=$((currentScore + 0)) fi @@ -595,13 +595,13 @@ check_3_20() { currentScore=$((currentScore + 1)) else warn "$check_3_20" - warn " * Wrong ownership for $file" + warn " * Wrong ownership for $file" resulttestjson "WARN" "Wrong ownership for $file" currentScore=$((currentScore - 1)) fi else info "$check_3_20" - info " * File not found" + info " * File not found" resulttestjson "INFO" "File not found" currentScore=$((currentScore + 0)) fi @@ -623,13 +623,13 @@ check_3_21() { currentScore=$((currentScore + 1)) else warn "$check_3_21" - warn " * Wrong permissions for $file" + warn " * Wrong permissions for $file" resulttestjson "WARN" "Wrong permissions for $file" currentScore=$((currentScore - 1)) fi else info "$check_3_21" - info " * File not found" + info " * File not found" resulttestjson "INFO" "File not found" currentScore=$((currentScore + 0)) fi @@ -651,13 +651,13 @@ check_3_22() { currentScore=$((currentScore + 1)) else warn "$check_3_22" - warn " * Wrong permissions for $file" + warn " * Wrong permissions for $file" resulttestjson "WARN" "Wrong permissions for $file" currentScore=$((currentScore - 1)) fi else info "$check_3_22" - info " * File not found" + info " * File not found" resulttestjson "INFO" "File not found" currentScore=$((currentScore + 0)) fi diff --git a/tests/5_container_runtime.sh b/tests/5_container_runtime.sh index 1aefd80..fcaa326 100644 --- a/tests/5_container_runtime.sh +++ b/tests/5_container_runtime.sh @@ -12,7 +12,7 @@ check_5() { check_running_containers() { # If containers is empty, there are no running containers if [ -z "$containers" ]; then - info " * No containers running, skipping Section 5" + info " * No containers running, skipping Section 5" running_containers=0 else running_containers=1