diff --git a/tests/test.sh b/tests/test.sh index 07a3721..661e8a7 100644 --- a/tests/test.sh +++ b/tests/test.sh @@ -4,7 +4,7 @@ DOCKER_IMAGE="ttionya/vaultwarden-backup:test" ERROR_NUM=0 -DATA_DIR="/bitwarden/data" +DATA_DIR="$(pwd)/fixtures/source/bitwarden/data" OUTPUT_DIR="output" EXTRACT_DIR="extract" REMOTE_DIR="/${OUTPUT_DIR}" @@ -39,7 +39,7 @@ function color() { ######################################## function check_files_same_in_folders() { function generate_hash_list() { - find "$1" -type f -exec sha1sum {} \; | sort | sed "s|$1||g" > "$2" + find "$1" -type f -not -name "db.*" -exec sha1sum {} \; | sort | sed "s|$1||g" > "$2" } color blue "Calculating file hash in folder \"$1\" and \"$2\"" diff --git a/tests/units/backup-zip-file/test.sh b/tests/units/backup-zip-file/test.sh index 60ee795..3d4012b 100644 --- a/tests/units/backup-zip-file/test.sh +++ b/tests/units/backup-zip-file/test.sh @@ -31,7 +31,14 @@ function test() { 7z l -p"${PASSWORD}" "${BACKUP_FILE}" - 7z e -aoa -p"${PASSWORD}" -o"${EXTRACT_DIR}" "${BACKUP_FILE}" + docker run --rm \ + --mount "type=bind,source=${EXTRACT_DIR},target=/bitwarden/data/" \ + --mount "type=bind,source=$(dirname "${BACKUP_FILE}"),target=/bitwarden/restore/" \ + "${DOCKER_IMAGE}" \ + restore \ + -f \ + -p "${PASSWORD}" \ + --zip-file "$(basename "${BACKUP_FILE}")" check_files_same_in_folders "${DATA_DIR}" "${EXTRACT_DIR}" if [[ $? != 0 ]]; then