[#4159] Remove duplicated version tests

diff --git a/src/bin/shell/tests/shell_ca_process_tests.sh.in b/src/bin/shell/tests/shell_ca_process_tests.sh.in
index 952bfcf69a35d29bc4d80732d5b988b6ff130c14..8fef4c6bc69ecaaeb5dcda5c595dc822bb8718bd 100755 (executable)
--- a/src/bin/shell/tests/shell_ca_process_tests.sh.in
+++ b/src/bin/shell/tests/shell_ca_process_tests.sh.in
@@ -164,25 +164,6 @@ shell_command_test() {
     test_finish 0
 }
 
-# This test verifies that the binary is reporting its version properly.
-version_test() {
-    test_name=${1}  # Test name
-
-    # Log the start of the test and print test name.
-    test_start "${test_suite}-${test_name}"
-
-    REPORTED_VERSION=$(${shell_bin_path}/${shell_bin} -v)
-
-    if test "${REPORTED_VERSION}" = "${EXPECTED_VERSION}"; then
-        test_finish 0
-    else
-        echo "ERROR:" \
-        "Expected version ${EXPECTED_VERSION}, got ${REPORTED_VERSION}"
-        test_finish 1
-    fi
-}
-
-version_test "shell.version"
 shell_command_test "shell.list-commands" "list-commands" \
     "[ { \"arguments\": [ \"build-report\", \"config-get\", \"config-hash-get\", \"config-reload\", \"config-set\", \"config-test\", \"config-write\", \"list-commands\", \"shutdown\", \"status-get\", \"version-get\" ], \"result\": 0 } ]" ""
 shell_command_test "shell.bogus" "give-me-a-beer" \

diff --git a/src/bin/shell/tests/shell_d2_process_tests.sh.in b/src/bin/shell/tests/shell_d2_process_tests.sh.in
index 902af94806cab826a75bffc38401de834358e0c6..8547c7c5597bbb583a64cea1ee48f00ac2d95715 100755 (executable)
--- a/src/bin/shell/tests/shell_d2_process_tests.sh.in
+++ b/src/bin/shell/tests/shell_d2_process_tests.sh.in
@@ -169,25 +169,6 @@ shell_command_test() {
     test_finish 0
 }
 
-# This test verifies that the binary is reporting its version properly.
-version_test() {
-    test_name=${1}  # Test name
-
-    # Log the start of the test and print test name.
-    test_start "${test_suite}-${test_name}"
-
-    REPORTED_VERSION=$(${shell_bin_path}/${shell_bin} -v)
-
-    if test "${REPORTED_VERSION}" = "${EXPECTED_VERSION}"; then
-        test_finish 0
-    else
-        echo "ERROR:" \
-        "Expected version ${EXPECTED_VERSION}, got ${REPORTED_VERSION}"
-        test_finish 1
-    fi
-}
-
-version_test "shell.version"
 shell_command_test "shell.list-commands" "list-commands" \
     "[ { \"arguments\": [ \"build-report\", \"config-get\", \"config-hash-get\", \"config-reload\", \"config-set\", \"config-test\", \"config-write\", \"list-commands\", \"shutdown\", \"statistic-get\", \"statistic-get-all\", \"statistic-reset\", \"statistic-reset-all\", \"status-get\", \"version-get\" ], \"result\": 0 } ]" ""
 shell_command_test "shell.bogus" "give-me-a-beer" \

diff --git a/src/bin/shell/tests/shell_dhcp4_process_tests.sh.in b/src/bin/shell/tests/shell_dhcp4_process_tests.sh.in
index 2aac3d39a1757990b332a0c344038aef5bcfdd1f..243670b62f9b3bcc4875c8263101d95fc1c2a4d0 100755 (executable)
--- a/src/bin/shell/tests/shell_dhcp4_process_tests.sh.in
+++ b/src/bin/shell/tests/shell_dhcp4_process_tests.sh.in
@@ -194,25 +194,6 @@ shell_command_test() {
     test_finish 0
 }
 
-# This test verifies that the binary is reporting its version properly.
-version_test() {
-    test_name=${1}  # Test name
-
-    # Log the start of the test and print test name.
-    test_start "${test_suite}-${test_name}"
-
-    REPORTED_VERSION=$(${shell_bin_path}/${shell_bin} -v)
-
-    if test "${REPORTED_VERSION}" = "${EXPECTED_VERSION}"; then
-        test_finish 0
-    else
-        echo "ERROR:" \
-        "Expected version ${EXPECTED_VERSION}, got ${REPORTED_VERSION}"
-        test_finish 1
-    fi
-}
-
-version_test "shell.version"
 shell_command_test "shell.list-commands" "list-commands" \
     "[ { \"arguments\": [ \"build-report\", \"config-backend-pull\", \"config-get\", \"config-hash-get\", \"config-reload\", \"config-set\", \"config-test\", \"config-write\", \"dhcp-disable\", \"dhcp-enable\", \"kea-lfc-start\", \"leases-reclaim\", \"list-commands\", \"server-tag-get\", \"shutdown\", \"statistic-get\", \"statistic-get-all\", \"statistic-global-get-all\", \"statistic-remove\", \"statistic-remove-all\", \"statistic-reset\", \"statistic-reset-all\", \"statistic-sample-age-set\", \"statistic-sample-age-set-all\", \"statistic-sample-count-set\", \"statistic-sample-count-set-all\", \"status-get\", \"subnet4-select-test\", \"subnet4o6-select-test\", \"version-get\" ], \"result\": 0 } ]" ""
 shell_command_test "shell.bogus" "give-me-a-beer" \

diff --git a/src/bin/shell/tests/shell_dhcp6_process_tests.sh.in b/src/bin/shell/tests/shell_dhcp6_process_tests.sh.in
index 94c4819af0a0ee20a36fb05a74714c6bc7154a01..7948e4ebe646b3af60cfd3bc70fd0921296855bc 100755 (executable)
--- a/src/bin/shell/tests/shell_dhcp6_process_tests.sh.in
+++ b/src/bin/shell/tests/shell_dhcp6_process_tests.sh.in
@@ -199,25 +199,6 @@ shell_command_test() {
     test_finish 0
 }
 
-# This test verifies that the binary is reporting its version properly.
-version_test() {
-    test_name=${1}  # Test name
-
-    # Log the start of the test and print test name.
-    test_start "${test_suite}-${test_name}"
-
-    REPORTED_VERSION=$(${shell_bin_path}/${shell_bin} -v)
-
-    if test "${REPORTED_VERSION}" = "${EXPECTED_VERSION}"; then
-        test_finish 0
-    else
-        echo "ERROR:" \
-        "Expected version ${EXPECTED_VERSION}, got ${REPORTED_VERSION}"
-        test_finish 1
-    fi
-}
-
-version_test "shell.version"
 shell_command_test "shell.list-commands" "list-commands" \
     "[ { \"arguments\": [ \"build-report\", \"config-backend-pull\", \"config-get\", \"config-hash-get\", \"config-reload\", \"config-set\", \"config-test\", \"config-write\", \"dhcp-disable\", \"dhcp-enable\", \"kea-lfc-start\", \"leases-reclaim\", \"list-commands\", \"server-tag-get\", \"shutdown\", \"statistic-get\", \"statistic-get-all\", \"statistic-global-get-all\", \"statistic-remove\", \"statistic-remove-all\", \"statistic-reset\", \"statistic-reset-all\", \"statistic-sample-age-set\", \"statistic-sample-age-set-all\", \"statistic-sample-count-set\", \"statistic-sample-count-set-all\", \"status-get\", \"subnet6-select-test\", \"version-get\" ], \"result\": 0 } ]" ""
 shell_command_test "shell.bogus" "give-me-a-beer" \