From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 9 Jun 2014 17:37:30 +0000 (+0200)
Subject: [3422] Merge branch 'master' into trac3422
X-Git-Tag: trac3434_base~6^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59c6599d73e4df0f20573a44ba7dc07b32d2578d;p=thirdparty%2Fkea.git

[3422] Merge branch 'master' into trac3422
---

59c6599d73e4df0f20573a44ba7dc07b32d2578d
diff --cc src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh
index 72f216f908,fc0cfc196c..97dadcbf34
--- a/src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh
+++ b/src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh
@@@ -88,9 -88,10 +88,10 @@@ f
  
  # Check if it is still running. It could have terminated (e.g. as a result
  # of configuration failure).
 -get_pids
 +get_pids ${BIN}
  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
  
diff --cc src/bin/dhcp6/tests/dhcp6_shutdown_test.sh
index 8a342d2a59,958b6d966a..f1f8dcc4ab
--- a/src/bin/dhcp6/tests/dhcp6_shutdown_test.sh
+++ b/src/bin/dhcp6/tests/dhcp6_shutdown_test.sh
@@@ -73,9 -73,10 +73,10 @@@ f
  
  # Check if it is still running. It could have terminated (e.g. as a result
  # of configuration failure).
 -get_pids
 +get_pids ${BIN}
  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
  
@@@ -101,9 -102,10 +102,10 @@@ if [ ${_WAIT_FOR_MESSAGE} -eq 0 ]; the
  fi
  
  # Server should have shut down.
 -get_pids
 +get_pids ${BIN}
  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 --cc src/lib/testutils/dhcp_test_lib.sh
index 3992fcb39e,b6656b5142..85bba3c9f3
--- a/src/lib/testutils/dhcp_test_lib.sh
+++ b/src/lib/testutils/dhcp_test_lib.sh
@@@ -206,12 -178,12 +206,13 @@@ wait_for_message() 
  
  # Sends specified signal to the Kea process.
  send_signal() {
 -    sig=${1}  # Signal number.
 +    sig=${1}       # Signal number.
 +    proc_name=${2} # Process name
      # Get Kea pid.
 -    get_pids
 +    get_pids ${proc_name}
      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}