From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 9 Jun 2015 17:20:11 +0000 (-0400)
Subject: [3883] Additional review fixes
X-Git-Tag: trac3732a_base~22^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e83cb2ed2766716b248ef91711eb8e3a052e9f51;p=thirdparty%2Fkea.git

[3883] Additional review fixes

- Reversed order in assert_eq message paramenters
- pgsql_upgrade_test() was missing setup steps to wipe and create the db
---

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index ef9002ba15..0c5c9c0046 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -238,7 +238,7 @@ mysql_upgrade() {
 pgsql_upgrade() {
     # @todo - When PostgreSQL has a schema greater than 1.0, this will need
     # to be implemented. See ticket #3600
-    pgysql_version_print
+    pgsql_version_print
     printf "\n"
 
     # Check if the scripts directory exists at all.
diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index d26a37d9a7..27eb97a41c 100644
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -44,10 +44,10 @@ pgsql_wipe() {
 
     # Make a set of drop commands, one for each table owned by keatest
     pgsql_execute "SELECT 'drop table if exists '||t.tablename || ' cascade;' as dcmd FROM pg_catalog.pg_tables t WHERE t.tableowner = 'keatest';"
-    assert_eq 0 $? "pgsql_wipe select failed, exit code: %d, expected: %d"
+    assert_eq 0 $? "pgsql_wipe select failed, expected exit code: %d, actual: %d"
     # Now execute the set of drop commands from the result set returned
     pgsql_execute "$_RESULT"
-    assert_eq 0 $? "pgsql_wipe drop failed, exit code: %d, expected: %d"
+    assert_eq 0 $? "pgsql_wipe drop failed, expected exit code: %d, actual: %d"
 }
 
 pgsql_lease_init_test() {
@@ -58,32 +58,32 @@ pgsql_lease_init_test() {
 
     # Create the database
     ${keaadmin} lease-init pgsql -u $db_user -p $db_password -n $db_name -d $scripts_dir
-    assert_eq 0 $? "kea-admin lease-init pgsql failed, exit code: %d, expected: %d"
+    assert_eq 0 $? "kea-admin lease-init pgsql failed, expected exit code: %d, actual: %d"
 
     # Verify that all the expected tables exist
 
     # Check schema_version table
     pgsql_execute "SELECT version, minor FROM schema_version;"
-    assert_eq 0 $? "schema_vesion table check failed, exit code: %d, expected: %d"
+    assert_eq 0 $? "schema_vesion table check failed, expected exit code: %d, actual: %d"
 
     # Check lease4 table
     pgsql_execute "SELECT address, hwaddr, client_id, valid_lifetime, expire, subnet_id, fqdn_fwd, fqdn_rev, hostname FROM lease4;"
-    assert_eq 0 $? "lease4 table check failed, exit code: %d, expected: %d"
+    assert_eq 0 $? "lease4 table check failed, expected exit code: %d, actual: %d"
 
     # Check lease6 table
     pgsql_execute "SELECT address, duid, valid_lifetime, expire, subnet_id, pref_lifetime, lease_type, iaid, prefix_len, fqdn_fwd, fqdn_rev, hostname FROM lease6;"
-    assert_eq 0 $? "lease6 table check failed, exit code: %d, expected: %d"
+    assert_eq 0 $? "lease6 table check failed, expected exit code: %d, actual: %d"
 
     # Check lease6_types table
     pgsql_execute "SELECT lease_type, name FROM lease6_types;"
-    assert_eq 0 $? "lease6_types table check failed, exit code: %d, expected: %d"
+    assert_eq 0 $? "lease6_types table check failed, expected exit code: %d, actual: %d"
 
     # Trying to create it again should fail.  This verifies the db present
     # check
     echo ""
     echo "DB created successfully, make sure we aren't allowed to try it again:"
     ${keaadmin} lease-init pgsql -u $db_user -p $db_password -n $db_name -d $scripts_dir
-    assert_eq 2 $? "kea-admin failed to deny lease-init, exit code: %d, expected: %d"
+    assert_eq 2 $? "kea-admin failed to deny lease-init, expected exit code: %d, actual: %d"
 
     # Let's wipe the whole database
     pgsql_wipe
@@ -99,7 +99,7 @@ pgsql_lease_version_test() {
 
     # Create the database
     ${keaadmin} lease-init pgsql -u $db_user -p $db_password -n $db_name -d $scripts_dir
-    assert_eq 0 $? "cannot initialize the database, exit code: %d, expected: %d"
+    assert_eq 0 $? "cannot initialize the database, expected exit code: %d, actual: %d"
 
     # Verfiy that kea-admin lease-version returns the correct version
     version=$(${keaadmin} lease-version pgsql -u $db_user -p $db_password -n $db_name)
@@ -114,8 +114,18 @@ pgsql_lease_version_test() {
 pgsql_upgrade_test() {
     test_start "pgsql.upgrade-test"
 
+    # Wipe the whole database
+    pgsql_wipe
+
+    # Create the database
+    ${keaadmin} lease-init pgsql -u $db_user -p $db_password -n $db_name -d $scripts_dir
+    assert_eq 0 $? "cannot initialize the database, expected exit code: %d, actual: %d"
+
     ${keaadmin} lease-upgrade pgsql -u $db_user -p $db_password -n $db_name -d $scripts_dir
-    assert_eq 1 $? "lease-upgrade should have failed, exit code: %d, expected: %d"
+    assert_eq 1 $? "lease-upgrade should have failed, expected exit code: %d, actual: %d"
+
+    # Let's wipe the whole database
+    pgsql_wipe
 
     test_finish 0
 }