Fix vault test container name collision and startup failures

Monkey-patch Container.terminate() to poll Docker until the container
name is fully released before returning.  The upstream implementation
calls container.remove(force=True) + container.wait(), but wait()
returns as soon as the process stops — Docker may not have released
the name yet.  When parameterized vault fixtures reuse the same name
across versions, the next containers.run() gets a 409 "name already
in use" error.

Also add SKIP_SETCAP=1 to the vault container environment so that
vault v2.0+ does not attempt setcap (which requires CAP_SETFCAP).

Workaround for saltstack/pytest-salt-factories#198

Author: dwoz

tests/pytests/functional/modules/test_vault.py

@@ -3,6 +3,7 @@
 import time
 
 import pytest
+from saltfactories.daemons.container import Container
 
 import salt.utils.path
 from tests.support.runtests import RUNTIME_VARS
@@ -16,6 +17,35 @@
 
 log = logging.getLogger(__name__)
 
+# Workaround for https://github.com/saltstack/pytest-salt-factories/issues/198
+# Container.terminate() does not wait for Docker to fully release the container
+# name, causing 409 "name already in use" errors when parameterized fixtures
+# recreate a container immediately after termination.
+_original_terminate = Container.terminate
+
+
+def _terminate_and_wait(self):
+    """
+    Call the original terminate and then poll Docker until the container
+    name is fully released.  This prevents 409 "name already in use"
+    errors when a new container is created immediately after termination.
+    """
+    if self._terminate_result is not None:
+        return self._terminate_result
+    name = self.name
+    client = self.docker_client
+    result = _original_terminate(self)
+    for _ in range(30):
+        try:
+            client.containers.get(name)
+            time.sleep(1)
+        except Exception:  # pylint: disable=broad-except
+            break
+    return result
+
+
+Container.terminate = _terminate_and_wait  # pylint: disable=E9502
+
 
 @pytest.fixture(scope="module")
 def minion_config_overrides(vault_port):
@@ -61,6 +91,7 @@ def vault_container_version(request, salt_factories, vault_port, shell):
             "environment": {
                 "VAULT_DEV_ROOT_TOKEN_ID": "testsecret",
                 "VAULT_LOCAL_CONFIG": json.dumps(config),
+                "SKIP_SETCAP": "1",
             },
             "cap_add": ["IPC_LOCK"],
         },

tests/pytests/integration/sdb/test_vault.py

@@ -9,13 +9,43 @@
 
 import pytest
 from pytestshellutils.utils.processes import ProcessResult
+from saltfactories.daemons.container import Container
 
 import salt.utils.path
 from tests.support.helpers import PatchedEnviron
 from tests.support.runtests import RUNTIME_VARS
 
 log = logging.getLogger(__name__)
 
+# Workaround for https://github.com/saltstack/pytest-salt-factories/issues/198
+# Container.terminate() does not wait for Docker to fully release the container
+# name, causing 409 "name already in use" errors when parameterized fixtures
+# recreate a container immediately after termination.
+_original_terminate = Container.terminate
+
+
+def _terminate_and_wait(self):
+    """
+    Call the original terminate and then poll Docker until the container
+    name is fully released.  This prevents 409 "name already in use"
+    errors when a new container is created immediately after termination.
+    """
+    if self._terminate_result is not None:
+        return self._terminate_result
+    name = self.name
+    client = self.docker_client
+    result = _original_terminate(self)
+    for _ in range(30):
+        try:
+            client.containers.get(name)
+            time.sleep(1)
+        except Exception:  # pylint: disable=broad-except
+            break
+    return result
+
+
+Container.terminate = _terminate_and_wait  # pylint: disable=E9502
+
 
 pytestmark = [
     pytest.mark.slow_test,
@@ -47,6 +77,7 @@ def vault_container_version(request, salt_factories, vault_port, patched_environ
         "default_lease_ttl": "168h",
         "max_lease_ttl": "720h",
     }
+
     factory = salt_factories.get_container(
         "vault",
         f"ghcr.io/saltstack/salt-ci-containers/vault:{vault_version}",
@@ -56,6 +87,7 @@ def vault_container_version(request, salt_factories, vault_port, patched_environ
             "environment": {
                 "VAULT_DEV_ROOT_TOKEN_ID": "testsecret",
                 "VAULT_LOCAL_CONFIG": json.dumps(config),
+                "SKIP_SETCAP": "1",
             },
             "cap_add": ["IPC_LOCK"],
         },