From 0ccc4aae722d966178fba3991b644388e0f814c5 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sun, 9 Nov 2025 09:32:42 +0100
Subject: [PATCH 1/2] chore: remove --debug

---
 tests/integration/app_deploy.bats | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/app_deploy.bats b/tests/integration/app_deploy.bats
index bb39b716..1d75e047 100644
--- a/tests/integration/app_deploy.bats
+++ b/tests/integration/app_deploy.bats
@@ -543,7 +543,7 @@ teardown(){
 
 # bats test_tags=slow
 @test "ignore timeout when not present in env" {
-  run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks --debug
+  run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks
   assert_success
   refute_output --partial "timeout: set to"
 }
@@ -554,7 +554,7 @@ teardown(){
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 
-  run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks --debug
+  run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks
   assert_success
   assert_output --partial "timeout: set to 120"
 }
-- 
2.49.0


From d75700c8a922bdda8646747a0cbb2a5a6d2b138e Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sun, 9 Nov 2025 09:32:52 +0100
Subject: [PATCH 2/2] test: ensure env vars updated

See https://git.coopcloud.tech/toolshed/abra/issues/723
---
 tests/integration/app_deploy.bats | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/integration/app_deploy.bats b/tests/integration/app_deploy.bats
index 1d75e047..f1c7ac3c 100644
--- a/tests/integration/app_deploy.bats
+++ b/tests/integration/app_deploy.bats
@@ -577,3 +577,27 @@ teardown(){
   assert_success
   refute_output --partial "IMAGES"
 }
+
+# bats test_tags=slow
+@test "re-deploy updates existing env vars" {
+  run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input
+  assert_success
+
+  run docker inspect --format='{{range .Config.Env}}{{println .}}{{end}}' \
+    $(docker ps -f name="$TEST_APP_DOMAIN_$TEST_SERVER" -q)
+  assert_success
+  assert_output --partial "WITH_COMMENT=foo"
+
+  run sed -i 's/WITH_COMMENT=foo/WITH_COMMENT=bar/g' \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --force
+  assert_success
+
+  run docker inspect --format='{{range .Config.Env}}{{println .}}{{end}}' \
+    $(docker ps -f name="$TEST_APP_DOMAIN_$TEST_SERVER" -q)
+  assert_success
+  refute_output --partial "WITH_COMMENT=foo"
+  assert_output --partial "WITH_COMMENT=bar"
+}
-- 
2.49.0