Commit 1bf7b6c4 authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

[3508] Unit-tests added for version reporting.

parent 0bcb05a8
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
CFG_FILE=@abs_top_builddir@/src/bin/d2/tests/test_config.json CFG_FILE=@abs_top_builddir@/src/bin/d2/tests/test_config.json
# Path to the D2 log file. # Path to the D2 log file.
LOG_FILE=@abs_top_builddir@/src/bin/d2/tests/test.log LOG_FILE=@abs_top_builddir@/src/bin/d2/tests/test.log
# Expected version
EXPECTED_VERSION="@PACKAGE_VERSION@"
# D2 configuration to be stored in the configuration file. # D2 configuration to be stored in the configuration file.
CONFIG="{ CONFIG="{
\"DhcpDdns\": \"DhcpDdns\":
...@@ -236,3 +238,4 @@ shutdown_test() { ...@@ -236,3 +238,4 @@ shutdown_test() {
dynamic_reconfiguration_test dynamic_reconfiguration_test
shutdown_test "dhcp-ddns.sigterm_test" 15 shutdown_test "dhcp-ddns.sigterm_test" 15
shutdown_test "dhcp-ddns.sigint_test" 2 shutdown_test "dhcp-ddns.sigint_test" 2
version_test "dhcp-ddns.version"
...@@ -351,9 +351,10 @@ core component within the DHCPv4 server (the Dhcpv4 server object) ...@@ -351,9 +351,10 @@ core component within the DHCPv4 server (the Dhcpv4 server object)
has failed. As a result, the server will exit. The reason for the has failed. As a result, the server will exit. The reason for the
failure is given within the message. failure is given within the message.
% DHCP4_STARTING server starting % DHCP4_STARTING Kea DHCPv4 server version %1 starting
This informational message indicates that the DHCPv4 server has This informational message indicates that the DHCPv4 server has
processed any command-line switches and is starting. processed any command-line switches and is starting. The version
is also printed.
% DHCP4_START_INFO pid: %1, port: %2, verbose: %3 % DHCP4_START_INFO pid: %1, port: %2, verbose: %3
This is a debug message issued during the DHCPv4 server startup. This is a debug message issued during the DHCPv4 server startup.
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
CFG_FILE=@abs_top_builddir@/src/bin/dhcp4/tests/test_config.json CFG_FILE=@abs_top_builddir@/src/bin/dhcp4/tests/test_config.json
# Path to the Kea log file. # Path to the Kea log file.
LOG_FILE=@abs_top_builddir@/src/bin/dhcp4/tests/test.log LOG_FILE=@abs_top_builddir@/src/bin/dhcp4/tests/test.log
# Expected version
EXPECTED_VERSION="@PACKAGE_VERSION@"
# Kea configuration to be stored in the configuration file. # Kea configuration to be stored in the configuration file.
CONFIG="{ CONFIG="{
\"Dhcp4\": \"Dhcp4\":
...@@ -256,3 +258,4 @@ shutdown_test() { ...@@ -256,3 +258,4 @@ shutdown_test() {
dynamic_reconfiguration_test dynamic_reconfiguration_test
shutdown_test "dhcpv4.sigterm_test" 15 shutdown_test "dhcpv4.sigterm_test" 15
shutdown_test "dhcpv4.sigint_test" 2 shutdown_test "dhcpv4.sigint_test" 2
version_test "dhcpv4.version"
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
CFG_FILE=@abs_top_builddir@/src/bin/dhcp6/tests/test_config.json CFG_FILE=@abs_top_builddir@/src/bin/dhcp6/tests/test_config.json
# Path to the Kea log file. # Path to the Kea log file.
LOG_FILE=@abs_top_builddir@/src/bin/dhcp6/tests/test.log LOG_FILE=@abs_top_builddir@/src/bin/dhcp6/tests/test.log
# Expected version
EXPECTED_VERSION="@PACKAGE_VERSION@"
# Kea configuration to be stored in the configuration file. # Kea configuration to be stored in the configuration file.
CONFIG="{ CONFIG="{
\"Dhcp6\": \"Dhcp6\":
...@@ -257,5 +259,6 @@ shutdown_test() { ...@@ -257,5 +259,6 @@ shutdown_test() {
} }
dynamic_reconfiguration_test dynamic_reconfiguration_test
shutdown_test "dhcpv4.sigterm_test" 15 shutdown_test "dhcpv6.sigterm_test" 15
shutdown_test "dhcpv4.sigint_test" 2 shutdown_test "dhcpv6.sigint_test" 2
version_test "dhcpv6.version"
...@@ -284,7 +284,7 @@ case ${command} in ...@@ -284,7 +284,7 @@ case ${command} in
args="-c ${kea_config_file}" args="-c ${kea_config_file}"
if [ "${kea_verbose}" = "yes" ]; then if [ "${kea_verbose}" = "yes" ]; then
args="${args} -v" args="${args} -d"
fi fi
# Run servers if they are on the list of servers from the command line # Run servers if they are on the list of servers from the command line
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment