From 1d34b2965f2bd9c4260b18a5b6ebfc55b867a0c2 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Fri, 19 Oct 2018 23:23:23 +0200
Subject: [PATCH] [148-lib-process-without-args] Repaired system tests

---
 src/bin/netconf/tests/netconf_tests.sh.in | 54 ++++++++++-------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/bin/netconf/tests/netconf_tests.sh.in b/src/bin/netconf/tests/netconf_tests.sh.in
index bbff70c558..4fc8807771 100644
--- a/src/bin/netconf/tests/netconf_tests.sh.in
+++ b/src/bin/netconf/tests/netconf_tests.sh.in
@@ -98,6 +98,27 @@ usage_test() {
     test_finish 0
 }
 
+# This test verifies that no argument is not reported as a PID file error.
+no_argument_test() {
+    local TESTNAME="${1}"
+    local EXP_CODE="${2}"
+
+    # Log the start of the test and print test name.
+    test_start $TESTNAME
+    # Remove dangling Kea instances and remove log files.
+    cleanup
+
+    # Check it
+    printf "Running command %s.\n" "\"${bin_path}/${bin}\""
+    ${bin_path}/${bin} | grep PID 2>&1
+    exit_code=$?
+    if [ ${exit_code} -ne $EXP_CODE ]; then
+        printf "ERROR: expected exit code ${EXP_CODE}, got ${exit_code}\n"
+        clean_exit 1
+    fi
+    test_finish 0
+}
+
 # This test verifies that syntax checking works properly. This function
 # requires 3 parameters:
 # testname
@@ -112,7 +133,6 @@ syntax_check_test() {
     test_start $TESTNAME
     # Remove dangling Kea instances and remove log files.
     cleanup
-
     # Create correct configuration file.
     create_config "${CONFIG}"
     # Check it
@@ -185,40 +205,14 @@ shutdown_test() {
     test_finish 0
 }
 
-# This test verifies that no argument is not reported as a PID file error.
-no_argument_test() {
-    local TESTNAME="${1}"
-    local EXP_CODE="${2}"
-
-    # Log the start of the test and print test name.
-    test_start $TESTNAME
-    # Remove dangling Kea instances and remove log files.
-    cleanup
-
-    # Check it
-    printf "Running command %s.\n" "\"${bin_path}/${bin}\""
-    ${bin_path}/${bin} | grep PID 2>&1
-    exit_code=$?
-    if [ ${exit_code} -ne $EXP_CODE ]; then
-        printf "ERROR: expected exit code ${EXP_CODE}, got ${exit_code}\n"
-        clean_exit 1
-    fi
-    test_finish 0
-}
-
 version_test "netconf.version"
 usage_test "netconf.invalid-param" "-f" 1
 usage_test "netconf.dash-h" "-h" 1
 usage_test "netconf.dash-v" "-v" 0
-
-# The following tests are currently disabled. Once we have a parser that is
-# able to understand logger configuration, those tests (imported from DHCPv4)
-# should work.
-#shutdown_test "netconf.sigterm_test" 15
-#shutdown_test "netconf.sigint_test" 2
+no_argument_test "netconf.no-argument" 1
+shutdown_test "netconf.sigterm_test" 15
+shutdown_test "netconf.sigint_test" 2
 logger_vars_test "netconf.variables"
 syntax_check_test "netconf.syntax_check_success" "${CONFIG}" 0
 syntax_check_test "netconf.syntax_check_bad_syntax" "${CONFIG_BAD_SYNTAX}" 1
 syntax_check_test "netconf.syntax_check_bad_values" "${CONFIG_BAD_VALUE}" 1
-
-no_argument_test "netconf.no-argument" 1
-- 
2.47.2