Work against untared content in test

offen · Dec 30, 2022 · c5b9926 · c5b9926
1 parent d980e47
commit c5b9926
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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 /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
@@ -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/backup/app_data/offen.db" ]; then
   fail "Could not find expected file in untared archive."
 fi