Fix log fetching (again)

This commit is contained in:
MaxJa4 2023-08-22 21:39:07 +02:00
parent a64c6ab9e1
commit 385d69241c

View File

@ -9,21 +9,13 @@ current_test=$(basename $(pwd))
docker compose up -d docker compose up -d
sleep 5 sleep 5
docker compose exec backup backup logs=$(docker compose exec -T backup backup)
sleep 5 sleep 5
expect_running_containers "3" expect_running_containers "3"
dvb_logs=$(docker compose logs backup) if echo "$logs" | grep -q "ERROR"; then
if echo "$dvb_logs" | grep -q "ERROR"; then
fail "Backup failed, errors reported: $dvb_logs"
else
pass "Backup succeeded, no errors reported."
fi
dbx_logs=$(docker compose logs openapi_mock)
if echo "$dbx_logs" | grep -q "ERROR"; then
fail "Backup failed, errors reported: $dvb_logs" fail "Backup failed, errors reported: $dvb_logs"
else else
pass "Backup succeeded, no errors reported." pass "Backup succeeded, no errors reported."
@ -35,10 +27,9 @@ fi
BACKUP_RETENTION_DAYS="0" docker compose up -d BACKUP_RETENTION_DAYS="0" docker compose up -d
sleep 5 sleep 5
docker compose exec backup backup logs=$(docker compose exec -T backup backup)
dvb_logs=$(docker compose logs backup) if echo "$logs" | grep -q "Refusing to do so, please check your configuration"; then
if echo "$dvb_logs" | grep -q "Refusing to do so, please check your configuration"; then
pass "Remote backups have not been deleted." pass "Remote backups have not been deleted."
else else
fail "Remote backups would have been deleted: $dvb_logs" fail "Remote backups would have been deleted: $dvb_logs"