fix: make status CLI test resilient to real K8s backend

Author: amanjain

tests/apps/test_status.py

@@ -127,30 +127,36 @@ def test_status_cli_space_syntax(
         assert "=== myapi" in result.output
 
     def test_status_cli_with_release_and_processes(
-        self, cli_runner: CliRunner, factory: KuberokuFactory
+        self,
+        cli_runner: CliRunner,
+        factory: KuberokuFactory,
+        request: pytest.FixtureRequest,
     ) -> None:
         """Status CLI renders release, processes, config, and addons."""
         factory.apps.create("myapi")
         factory.deploy.deploy("myapi", image="nginx:1.27", wait=False)
-        _create_fake_pod(factory, "myapi", "web", "pod-a", image="nginx:1.27")
+        if request.config.getoption("--backend") == "fake":
+            _create_fake_pod(factory, "myapi", "web", "pod-a", image="nginx:1.27")
         factory.config.set("myapi", {"DB": "pg://x"})
         factory.config.set("myapi", {"KEY": "secret"}, secret=True)
         factory.addons.create("myapi", "postgres")
         result = cli_runner.invoke(cli, ["apps:status", "myapi"], obj={"factory": factory})
         assert result.exit_code == 0
         output = result.output
-        # Release line with version (v4 because addon+config each create releases)
+        # Release line
         assert "Release:" in output
         assert "(Config change" in output or "(Deploy" in output
-        # Processes section with running count
+        # Processes section with web
+        assert "Processes:" in output
         assert "web" in output
-        assert "1/1 running" in output
+        assert "running" in output
+        assert "nginx:1.27" in output
         assert "ports: 8080/tcp" in output
         # Config count
         assert "2 vars (1 secrets)" in output
         # Addons
         assert "postgres (running)" in output
-        # Domains (none since no ingress controller)
+        # Domains
         assert "Domains:" in output
         # Maintenance off
         assert "Maintenance:  off" in output

tests/deploy/test_deploy_retry.py

@@ -0,0 +1,85 @@
+"""Tests for deploy retry on 409 Conflict and command removal paths."""
+
+from __future__ import annotations
+
+from kuberoku.factory import KuberokuFactory
+from kuberoku.k8s.resources import safe_name
+from tests.backends.fake import FakeK8sClient
+
+
+def test_update_deployment_retries_on_409() -> None:
+    """Deploy update retries on 409 Conflict."""
+    k8s = FakeK8sClient()
+    factory = KuberokuFactory(k8s_client=k8s, namespace="test-ns")
+    factory.apps.create("myapp")
+    factory.deploy.deploy("myapp", image="myapp:v1", wait=False)
+
+    dep_name = safe_name(factory.prefix, "myapp", "web")
+    k8s.inject_conflict("Deployment", factory.namespace, dep_name, count=2)
+
+    factory.deploy.deploy("myapp", image="myapp:v2", wait=False)
+    dep = k8s.get_deployment(factory.namespace, dep_name)
+    assert dep["spec"]["template"]["spec"]["containers"][0]["image"] == "myapp:v2"
+
+
+def test_update_deployment_exhausts_retries() -> None:
+    """Deploy update exhausts retry loop, succeeds on final attempt."""
+    k8s = FakeK8sClient()
+    factory = KuberokuFactory(k8s_client=k8s, namespace="test-ns")
+    factory.apps.create("myapp")
+    factory.deploy.deploy("myapp", image="myapp:v1", wait=False)
+
+    dep_name = safe_name(factory.prefix, "myapp", "web")
+    # 5 conflicts = exhausts retry loop (5 attempts), succeeds on final attempt
+    k8s.inject_conflict("Deployment", factory.namespace, dep_name, count=5)
+
+    factory.deploy.deploy("myapp", image="myapp:v2", wait=False)
+    dep = k8s.get_deployment(factory.namespace, dep_name)
+    assert dep["spec"]["template"]["spec"]["containers"][0]["image"] == "myapp:v2"
+
+
+def test_deploy_removes_command_when_none() -> None:
+    """Redeploying without a command removes the previously-set command."""
+    k8s = FakeK8sClient()
+    factory = KuberokuFactory(k8s_client=k8s, namespace="test-ns")
+    factory.apps.create("myapp")
+    factory.deploy.deploy("myapp", image="myapp:v1", wait=False)
+
+    # Manually set a command on the deployment
+    dep_name = safe_name(factory.prefix, "myapp", "web")
+    dep = k8s.get_deployment(factory.namespace, dep_name)
+    dep["spec"]["template"]["spec"]["containers"][0]["command"] = ["/bin/sh", "-c", "old-cmd"]
+    k8s.update_deployment(factory.namespace, dep_name, dep)
+
+    # Redeploy with no command — should remove the command
+    factory.deploy.deploy("myapp", image="myapp:v2", wait=False)
+    dep = k8s.get_deployment(factory.namespace, dep_name)
+    assert "command" not in dep["spec"]["template"]["spec"]["containers"][0]
+
+
+def test_restart_deployment_retries_on_409() -> None:
+    """Restart deployment retries on 409 Conflict."""
+    k8s = FakeK8sClient()
+    factory = KuberokuFactory(k8s_client=k8s, namespace="test-ns")
+    factory.apps.create("myapp")
+    factory.deploy.deploy("myapp", image="myapp:v1", wait=False)
+
+    dep_name = safe_name(factory.prefix, "myapp", "web")
+    k8s.inject_conflict("Deployment", factory.namespace, dep_name, count=2)
+
+    count = factory.deploy._restart_deployments("myapp")
+    assert count == 1
+
+
+def test_restart_deployment_exhausts_retries() -> None:
+    """Restart deployment exhausts retry loop, succeeds on final attempt."""
+    k8s = FakeK8sClient()
+    factory = KuberokuFactory(k8s_client=k8s, namespace="test-ns")
+    factory.apps.create("myapp")
+    factory.deploy.deploy("myapp", image="myapp:v1", wait=False)
+
+    dep_name = safe_name(factory.prefix, "myapp", "web")
+    k8s.inject_conflict("Deployment", factory.namespace, dep_name, count=5)
+
+    count = factory.deploy._restart_deployments("myapp")
+    assert count == 1