From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 5 Jun 2014 08:29:08 +0000 (+0200)
Subject: [3405] Fixed line breaks in the shell-based tests.
X-Git-Tag: trac3434_base~11^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78e93d361bedc8104fa49d2222f507184e7c96a4;p=thirdparty%2Fkea.git

[3405] Fixed line breaks in the shell-based tests.
---

diff --git a/src/bin/dhcp4/tests/dhcp4_reconfigure_test.sh b/src/bin/dhcp4/tests/dhcp4_reconfigure_test.sh
index 0bd60362c2..91c12adc6f 100755
--- a/src/bin/dhcp4/tests/dhcp4_reconfigure_test.sh
+++ b/src/bin/dhcp4/tests/dhcp4_reconfigure_test.sh
@@ -88,7 +88,8 @@ fi
 # of configuration failure).
 get_pids
 if [ ${_GET_PIDS_NUM} -ne 1 ]; then
-    printf "ERROR: expected one Kea process to be started. Found %d processes started.\n" ${_GET_PIDS_NUM}
+    printf "ERROR: expected one Kea process to be started. Found %d processes\
+ started.\n" ${_GET_PIDS_NUM}
     clean_exit 1
 fi
 
@@ -119,7 +120,8 @@ if [ ${_GET_RECONFIGS} -ne 1 ]; then
     printf "ERROR: server has been reconfigured despite bogus configuration.\n"
     clean_exit 1
 elif [ ${_GET_RECONFIG_ERRORS} -ne 1 ]; then
-    printf "ERROR: server did not report reconfiguration error despite attempt to configure it with invalid configuration.\n"
+    printf "ERROR: server did not report reconfiguration error despite attempt\
+ to configure it with invalid configuration.\n"
     clean_exit 1
 fi
 
diff --git a/src/bin/dhcp4/tests/dhcp4_shutdown_test.sh b/src/bin/dhcp4/tests/dhcp4_shutdown_test.sh
index 9f043350b8..dabfe65a5e 100755
--- a/src/bin/dhcp4/tests/dhcp4_shutdown_test.sh
+++ b/src/bin/dhcp4/tests/dhcp4_shutdown_test.sh
@@ -74,7 +74,8 @@ fi
 # of configuration failure).
 get_pids
 if [ ${_GET_PIDS_NUM} -ne 1 ]; then
-    printf "ERROR: expected one Kea process to be started. Found %d processes started.\n" ${_GET_PIDS_NUM}
+    printf "ERROR: expected one Kea process to be started. Found %d processes\
+ started.\n" ${_GET_PIDS_NUM}
     clean_exit 1
 fi
 
@@ -102,7 +103,8 @@ fi
 # Server should have shut down.
 get_pids
 if [ ${_GET_PIDS_NUM} -ne 0 ]; then
-    printf "ERROR: Kea did not shut down after receiving signal.\n" ${_GET_PIDS_NUM}
+    printf "ERROR: Kea did not shut down after receiving signal.\n"\
+ ${_GET_PIDS_NUM}
     clean_exit 1
 fi
 
diff --git a/src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh b/src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh
index 7a13bec1e9..fc0cfc196c 100755
--- a/src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh
+++ b/src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh
@@ -90,7 +90,8 @@ fi
 # of configuration failure).
 get_pids
 if [ ${_GET_PIDS_NUM} -ne 1 ]; then
-    printf "ERROR: expected one Kea process to be started. Found %d processes started.\n" ${_GET_PIDS_NUM}
+    printf "ERROR: expected one Kea process to be started. Found %d processes\
+ started.\n" ${_GET_PIDS_NUM}
     clean_exit 1
 fi
 
@@ -121,7 +122,8 @@ if [ ${_GET_RECONFIGS} -ne 1 ]; then
     printf "ERROR: server has been reconfigured despite bogus configuration.\n"
     clean_exit 1
 elif [ ${_GET_RECONFIG_ERRORS} -ne 1 ]; then
-    printf "ERROR: server did not report reconfiguration error despite attempt to configure it with invalid configuration.\n"
+    printf "ERROR: server did not report reconfiguration error despite attempt\
+ to configure it with invalid configuration.\n"
     clean_exit 1
 fi
 
diff --git a/src/bin/dhcp6/tests/dhcp6_shutdown_test.sh b/src/bin/dhcp6/tests/dhcp6_shutdown_test.sh
index 52810cb91d..958b6d966a 100755
--- a/src/bin/dhcp6/tests/dhcp6_shutdown_test.sh
+++ b/src/bin/dhcp6/tests/dhcp6_shutdown_test.sh
@@ -75,7 +75,8 @@ fi
 # of configuration failure).
 get_pids
 if [ ${_GET_PIDS_NUM} -ne 1 ]; then
-    printf "ERROR: expected one Kea process to be started. Found %d processes started.\n" ${_GET_PIDS_NUM}
+    printf "ERROR: expected one Kea process to be started. Found %d processes\
+ started.\n" ${_GET_PIDS_NUM}
     clean_exit 1
 fi
 
@@ -103,7 +104,8 @@ fi
 # Server should have shut down.
 get_pids
 if [ ${_GET_PIDS_NUM} -ne 0 ]; then
-    printf "ERROR: Kea did not shut down after receiving signal.\n" ${_GET_PIDS_NUM}
+    printf "ERROR: Kea did not shut down after receiving signal.\n"\
+ ${_GET_PIDS_NUM}
     clean_exit 1
 fi
 
diff --git a/src/lib/testutils/dhcp_test_lib.sh b/src/lib/testutils/dhcp_test_lib.sh
index 0fc2e01dd9..b6656b5142 100755
--- a/src/lib/testutils/dhcp_test_lib.sh
+++ b/src/lib/testutils/dhcp_test_lib.sh
@@ -182,7 +182,8 @@ send_signal() {
     # Get Kea pid.
     get_pids
     if [ ${_GET_PIDS_NUM} -ne 1 ]; then
-        printf "ERROR: expected one Kea process to be started. Found %d processes started.\n" ${_GET_PIDS_NUM}
+        printf "ERROR: expected one Kea process to be started.\
+ Found %d processes started.\n" ${_GET_PIDS_NUM}
         clean_exit 1
     fi
     printf "Sending signal ${sig} to Kea process (pid=%s).\n" ${_GET_PIDS}