[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 0bd60362c2354f2fce56d959b96e5e622c166140..91c12adc6fde010bafa9b5857b53fbf1020ce9ec 100755 (executable)
--- 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 9f043350b8674a16693a394b241b49d4c940b2e3..dabfe65a5ec2040944047aa0928e2f7810d67a97 100755 (executable)
--- 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 7a13bec1e976cea442429ea919459f303bce295a..fc0cfc196c575012505243570a5e5350013ce5e5 100755 (executable)
--- 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 52810cb91dc67eeb982573d090a981dd995a3630..958b6d966a7290226fb4249133f537eeb57ec45a 100755 (executable)
--- 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 0fc2e01dd9daaa1ff2c1f3f2c2c65cd382f1ede0..b6656b514288754dbcbb8cf0844670a7631b78ec 100755 (executable)
--- 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}