[#2225] tests for "kea-admin -x"

diff --git a/src/bin/admin/tests/admin_tests.sh.in b/src/bin/admin/tests/admin_tests.sh.in
index d12c762ec8b1e9b846d67551cb94807da96658fd..a8ce7f19a6ddb0512b2ccb37f8aa2c291b2f19a3 100644 (file)
--- a/src/bin/admin/tests/admin_tests.sh.in
+++ b/src/bin/admin/tests/admin_tests.sh.in
@@ -113,6 +113,20 @@ kea_admin_error_reporting_tests() {
   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_version.mysql.x'
+  run_command \
+    "${kea_admin}" db-version mysql -x
+  assert_eq 1 "${EXIT_CODE}"
+  assert_str_eq 'ERROR/kea-admin: -x or --extra requires a parameter' "$(printf '%s\n' "${OUTPUT}" | head -n 1)"
+  test_finish ${?}
+
+  test_start 'kea_admin_error_reporting_test.db_version.mysql.extra'
+  run_command \
+    "${kea_admin}" db-version mysql --extra
+  assert_eq 1 "${EXIT_CODE}"
+  assert_str_eq 'ERROR/kea-admin: -x or --extra requires a parameter' "$(printf '%s\n' "${OUTPUT}" | head -n 1)"
+  test_finish ${?}
 }
 
 # Run tests.

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 5b4609ff0959867e2e5f1992f044adf744777b68..95610ccfbe5eea7ef58e679562c62378f40a5c3a 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -179,11 +179,21 @@ mysql_db_version_with_extra_test() {
 INSERT INTO schema_version VALUES (1, 7);'
     assert_eq 0 "${EXIT_CODE}" "schema_version table cannot be created. (expected %d, exit code %d)"
 
+    # Single -x.
     run_command \
         "${kea_admin}" db-version mysql -u "${db_user}" -p "${db_password}" -n "${db_name}" -x --protocol=TCP
     version="${OUTPUT}"
+    assert_eq 0 "${EXIT_CODE}" "kea-admin -x failed. (expected %d, exit code %d)"
     assert_str_eq "1.7" "${version}" "Expected kea-admin to return %s, returned value was %s"
 
+    # Multiple -x.
+    run_command \
+        "${kea_admin}" db-version mysql -u "${db_user}" -p "${db_password}" -n "${db_name}" \
+        -x --protocol=TCP -x --hello 2> "@abs_top_srcdir@/src/bin/admin/test-data"
+    assert_eq 2 "${EXIT_CODE}" "kea-admin -x -x succeeded. (expected %d, exit code %d)"
+    assert_str_eq "mysql: unknown option '--hello'" "$(tail -n 1 "@abs_top_srcdir@/src/bin/admin/test-data")"
+    rm -f "@abs_top_srcdir@/src/bin/admin/test-data"
+
     # Let's wipe the whole database
     mysql_wipe