From bdcff23ea3a7a7bf3adca9b0d6faf96cf5dbda04 Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Fri, 30 Dec 2022 08:46:09 +0100 Subject: [PATCH] Work against untared content in test --- test/extend/docker-compose.yml | 2 +- test/extend/run.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/extend/docker-compose.yml b/test/extend/docker-compose.yml index 05e1b7f9..c4aa624a 100644 --- a/test/extend/docker-compose.yml +++ b/test/extend/docker-compose.yml @@ -5,7 +5,7 @@ services: image: offen/docker-volume-backup:${TEST_VERSION:-canary} restart: always labels: - - docker-volume-backup.copy-post=/bin/sh -c 'rsync $$COMMAND_RUNTIME_ARCHIVE_FILEPATH /local' + - docker-volume-backup.copy-post=/bin/sh -c 'mkdir -p /tmp/unpack && tar -xvf $$COMMAND_RUNTIME_ARCHIVE_FILEPATH -C /tmp/unpack && rsync -r /tmp/unpack/backup/app_data /local' environment: BACKUP_FILENAME: test.tar.gz BACKUP_CRON_EXPRESSION: 0 0 5 31 2 ? diff --git a/test/extend/run.sh b/test/extend/run.sh index 6cf1e6d4..d7bdb072 100644 --- a/test/extend/run.sh +++ b/test/extend/run.sh @@ -21,9 +21,9 @@ sleep 5 expect_running_containers "2" -tmp_dir=$(mktemp -d) -tar -xvf ./local/test.tar.gz -C $tmp_dir -if [ ! -f "$tmp_dir/backup/app_data/offen.db" ]; then +find ./local + +if [ ! -f "./local/app_data/offen.db" ]; then fail "Could not find expected file in untared archive." fi