mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 22:45:18 +00:00
Code Issues Releases Wiki Activity

[#1574] memfile shell tests: clean up csv.2

Browse Source
This commit is contained in:
Andrei Pavel
2020-12-14 11:03:43 +02:00
parent bee12f7909
commit b3ae929154
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/admin/tests/memfile_tests.sh.in
View File

@@ -27,6 +27,7 @@ clean_up() {
remove_if_exists \ remove_if_exists \
"${config_file-}" \ "${config_file-}" \
"${csv-}" \ "${csv-}" \
"${csv_2-}" \
"${KEA_LOCKFILE_DIR-}" \ "${KEA_LOCKFILE_DIR-}" \
"${KEA_PIDFILE_DIR-}" "${KEA_PIDFILE_DIR-}"
} }
@@ -163,6 +164,7 @@ memfile_upgrade_test() {
csv=$(csv_file "${v}") csv=$(csv_file "${v}")
"incomplete_memfile_header_v${v}" > "${csv}" "incomplete_memfile_header_v${v}" > "${csv}"
printf '\n' >> "${csv}" printf '\n' >> "${csv}"
csv_2="${csv}.2"
"${kea_lfc}" "-${v}" \ "${kea_lfc}" "-${v}" \
-c 'ignored-path' \ -c 'ignored-path' \
@@ -170,9 +172,9 @@ memfile_upgrade_test() {
-i "${csv}" \ -i "${csv}" \
-o "${csv}.output" \ -o "${csv}.output" \
-p "${csv}.pid" \ -p "${csv}.pid" \
-x "${csv}.2" -x "${csv_2}"
content=$(cat "${csv}.2") content=$(cat "${csv_2}")
expected=$(memfile_header_v${v}) expected=$(memfile_header_v${v})
if test "${content}" != "${expected}"; then if test "${content}" != "${expected}"; then
printf 'ERROR: %s does not contain expected header.\n< %s\n> %s\n' \ printf 'ERROR: %s does not contain expected header.\n< %s\n> %s\n' \