From dec918464140dcd87d10760f0d0df65fb9b9bed2 Mon Sep 17 00:00:00 2001 From: Piotrek Zadroga Date: Wed, 31 May 2023 16:17:48 +0200 Subject: [PATCH] [#2855] Add UTs for missing lease type --- src/bin/admin/kea-admin.in | 2 +- src/bin/admin/tests/admin_tests.sh.in | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in index 111b4c71ef..2de91bbfde 100644 --- a/src/bin/admin/kea-admin.in +++ b/src/bin/admin/kea-admin.in @@ -691,7 +691,7 @@ stringify_positions_in_line() { lease_upload() { # Check the lease type was given if [ ${dhcp_version} -eq 0 ]; then - log_error "lease-upload: lease type -4 or -6 needs to be specified" + log_error "lease-upload: lease type ( -4 or -6 ) needs to be specified" usage exit 1 fi diff --git a/src/bin/admin/tests/admin_tests.sh.in b/src/bin/admin/tests/admin_tests.sh.in index a987d20a8a..1f71b482f9 100644 --- a/src/bin/admin/tests/admin_tests.sh.in +++ b/src/bin/admin/tests/admin_tests.sh.in @@ -86,34 +86,48 @@ kea_admin_error_reporting_tests() { assert_str_eq 'ERROR/kea-admin: -d or --directory requires a parameter' "$(printf '%s\n' "${OUTPUT}" | head -n 1)" test_finish ${?} - test_start 'kea_admin_error_reporting_test.db_init.mysql.i' + test_start 'kea_admin_error_reporting_test.lease_dump.mysql.i' run_command \ "${kea_admin}" lease-dump mysql -i assert_eq 1 "${EXIT_CODE}" assert_str_eq 'ERROR/kea-admin: -i or --input requires a parameter' "$(printf '%s\n' "${OUTPUT}" | head -n 1)" test_finish ${?} - test_start 'kea_admin_error_reporting_test.db_init.mysql.input' + test_start 'kea_admin_error_reporting_test.lease_dump.mysql.input' run_command \ "${kea_admin}" lease-dump mysql --input assert_eq 1 "${EXIT_CODE}" assert_str_eq 'ERROR/kea-admin: -i or --input requires a parameter' "$(printf '%s\n' "${OUTPUT}" | head -n 1)" test_finish ${?} - test_start 'kea_admin_error_reporting_test.db_init.mysql.o' + test_start 'kea_admin_error_reporting_test.lease_dump.mysql.o' run_command \ "${kea_admin}" lease-dump mysql -o assert_eq 1 "${EXIT_CODE}" assert_str_eq 'ERROR/kea-admin: -o or --output requires a parameter' "$(printf '%s\n' "${OUTPUT}" | head -n 1)" test_finish ${?} - test_start 'kea_admin_error_reporting_test.db_init.mysql.output' + test_start 'kea_admin_error_reporting_test.lease_dump.mysql.output' run_command \ "${kea_admin}" lease-dump mysql --output assert_eq 1 "${EXIT_CODE}" assert_str_eq 'ERROR/kea-admin: -o or --output requires a parameter' "$(printf '%s\n' "${OUTPUT}" | head -n 1)" test_finish ${?} + test_start 'kea_admin_error_reporting_test.lease_dump.mysql.lease_type_missing' + run_command \ + "${kea_admin}" lease-dump mysql + assert_eq 1 "${EXIT_CODE}" + assert_str_eq 'ERROR/kea-admin: lease-dump: lease type ( -4 or -6 ) needs to be specified' "$(printf '%s\n' "${OUTPUT}" | head -n 1)" + test_finish ${?} + + test_start 'kea_admin_error_reporting_test.lease_upload.mysql.lease_type_missing' + run_command \ + "${kea_admin}" lease-upload mysql + assert_eq 1 "${EXIT_CODE}" + assert_str_eq 'ERROR/kea-admin: lease-upload: lease type ( -4 or -6 ) needs to be specified' "$(printf '%s\n' "${OUTPUT}" | head -n 1)" + test_finish ${?} + test_start 'kea_admin_error_reporting_test.db_version.mysql.x' run_command \ "${kea_admin}" db-version mysql -x -- 2.47.2