From: Razvan Becheriu <razvan@isc.org>
Date: Thu, 17 Dec 2020 11:52:49 +0000 (+0200)
Subject: [#1616] fixed cql upgrade script and enabled unittest
X-Git-Tag: Kea-1.9.4~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d8b52f941455bbfb87aa3a8ed9ffcd5354fa2c8;p=thirdparty%2Fkea.git

[#1616] fixed cql upgrade script and enabled unittest
---

diff --git a/src/bin/admin/tests/cql_tests.sh.in b/src/bin/admin/tests/cql_tests.sh.in
index 4f7b1c9bcf..ffb6bfe42e 100644
--- a/src/bin/admin/tests/cql_tests.sh.in
+++ b/src/bin/admin/tests/cql_tests.sh.in
@@ -504,7 +504,4 @@ cql_upgrade_test
 cql_lease4_dump_test
 cql_lease6_dump_test
 cql_unused_subnet_id_test
-# TODO: cql_upgrade_hosts_test below is commented because `generate_key` in
-# upgrade_3.0_to_4.0.sh generates different keys than the ones in the reference
-# file. To be investigated...
-# cql_upgrade_hosts_test
+cql_upgrade_hosts_test
diff --git a/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in b/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in
index d9a5cba81e..11f430a86b 100644
--- a/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in
+++ b/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in
@@ -163,6 +163,8 @@ exit_now() {
 fill() {
     string=$1;shift
     count=$1;shift
+    length="${#string}"
+    count=$((count - length));
     fill_char=$1;shift
     value="$(printf "%${count}s" | sed "s/ /${fill_char}/g")${string}"
 }