Publish curated Unraid-AppOps-Gateway source from ad0a390e431166c3198a2ac3bec010c2b44f2dea

backend/tests/test_controller_state_reconciliation.py

@@ -181,60 +181,55 @@ def test_successful_reconciliation_can_be_rolled_back_before_controller_swap(tmp
     assert not journal.exists()
 
 
-def test_upgrade_stops_old_writer_before_locking_cache_and_reconciles_while_stopped():
+def test_upgrade_prepares_before_stop_and_reconciles_between_stop_and_activation():
     script = UPGRADE_PATH.read_text(encoding="utf-8")
 
-    cache_lock = 'flock -x "$cache_lock_fd"'
-    stop = 'writers_stopped=1\ndocker compose --project-directory "$ROOT" -f "$COMPOSE_FILE" stop "$COMPOSE_SERVICE"'
-    reconcile = 'python3 "${stage}/reconcile_controller_state.py" \\\n  --legacy-root'
-    backup = 'cp -a -- "$CONTROLLER_DIR" "$backup/controller"'
-    swap = 'mv -- "$CONTROLLER_DIR" "$previous"'
+    prepare = 'backup="$(python3 "${work}/${PREPARER_NAME}" prepare \\'
+    stop = 'python3 "${work}/${PREPARER_NAME}" stop --backup "$backup"'
+    reconcile = 'python3 "${work}/reconcile_controller_state.py" \\\n  --legacy-root'
+    activate = 'python3 "${work}/${PREPARER_NAME}" activate --backup "$backup"'
 
     assert '/srv/example/appdata/gitea-deploy-runners/deploy.lock' not in script
-    assert script.index(stop) < script.index(cache_lock)
-    assert script.index(stop) < script.index(backup)
-    assert script.index(cache_lock) < script.index(backup)
-    assert script.index(backup) < script.index(reconcile)
-    assert script.index(reconcile) < script.index(swap)
-    assert 'flock -u "$cache_lock_fd"' not in script
+    assert script.index(prepare) < script.index(stop)
+    assert script.index(stop) < script.index(reconcile)
+    assert script.index(reconcile) < script.index(activate)
+    assert 'flock -x "$promotion_lock_fd"' in script
+    assert 'mv -- "$CONTROLLER_DIR"' not in script
+    assert 'cp -a -- "$CONTROLLER_DIR"' not in script
 
 
-def test_upgrade_retains_and_validates_optional_private_tls_before_stopping_controller():
+def test_upgrade_prepares_and_validates_captured_optional_private_tls_before_stopping_controller():
     script = UPGRADE_PATH.read_text(encoding="utf-8")
 
-    stage_copy = 'cp -a -- "$CONTROLLER_DIR" "${stage}/controller"'
-    tls_gate = (
-        'if [[ -e "${stage}/controller/private-tls.json" '
-        '|| -L "${stage}/controller/private-tls.json" ]]; then\n'
-        '  python3 "${stage}/controller/status_server.py" --check-private-tls-config\n'
-        'fi'
-    )
-    stop = (
-        'writers_stopped=1\ndocker compose --project-directory "$ROOT" '
-        '-f "$COMPOSE_FILE" stop "$COMPOSE_SERVICE"'
-    )
+    prepare = 'backup="$(python3 "${work}/${PREPARER_NAME}" prepare \\'
+    stop = 'python3 "${work}/${PREPARER_NAME}" stop --backup "$backup"'
+    preparer = (ROOT / "scripts/prepare_controller_hub_release_volume.py").read_text(encoding="utf-8")
 
-    assert stage_copy in script
-    assert script.index(stage_copy) < script.index(tls_gate)
-    assert script.index(tls_gate) < script.index(stop)
-    assert 'cp -a -- "$CONTROLLER_DIR" "$backup/controller"' in script
+    assert "_validate_previous_private_tls(stage_root)" in preparer
+    assert script.index(prepare) < script.index(stop)
 
 
 def test_upgrade_rolls_back_state_before_restoring_or_starting_the_old_writer():
     script = UPGRADE_PATH.read_text(encoding="utf-8")
     restore = script[script.index("restore_previous() {") : script.index("cleanup() {")]
 
-    stop = 'docker compose --project-directory "$ROOT" -f "$COMPOSE_FILE" stop "$COMPOSE_SERVICE"'
+    stop = 'if ! python3 "${work}/${PREPARER_NAME}" rollback --backup "$backup" --stop-only; then'
     rollback = '--rollback'
-    restore_controller = 'mv -- "$previous" "$CONTROLLER_DIR"'
-    start = 'docker compose --project-directory "$ROOT" -f "$COMPOSE_FILE" up -d --force-recreate "$COMPOSE_SERVICE"'
+    restore_controller = 'if ! python3 "${work}/${PREPARER_NAME}" rollback --backup "$backup"; then'
 
     assert restore.index(stop) < restore.index(rollback)
     assert restore.index(rollback) < restore.index(restore_controller)
-    assert restore.index(restore_controller) < restore.index(start)
-    assert "the old writer will remain stopped" in script
-    reconcile = 'python3 "${stage}/reconcile_controller_state.py" \\\n  --legacy-root'
-    assert script.index("reconciliation_active=1", script.index("writers_stopped=1")) < script.index(reconcile)
+    assert "controller remains stopped" in script
+    assert 'mv -- "$previous"' not in restore
+    assert 'docker compose --project-directory "$ROOT"' not in restore
+    reconcile = 'python3 "${work}/reconcile_controller_state.py"'
+    stopped = script.index("writers_stopped=1", script.index(stop))
+    reconcile_index = script.index(reconcile, stopped)
+    activate_index = script.index(
+        'python3 "${work}/${PREPARER_NAME}" activate --backup "$backup"',
+        reconcile_index,
+    )
+    assert stopped < reconcile_index < activate_index
     assert '[[ -f "$migration_journal" && ! -L "$migration_journal" ]]' in restore
     assert '[[ -e "$migration_journal" || -L "$migration_journal" ]]' in restore