Skip to content

Agent Mesh

fix e2e tests

Antonio Ojeaa713a8963bb5
diff --git a/tests/e2e/lib/container_mesh.bash b/tests/e2e/lib/container_mesh.bash
index 6af060a3..0c3d46ce 100644
--- a/tests/e2e/lib/container_mesh.bash
+++ b/tests/e2e/lib/container_mesh.bash
@@ -346,7 +346,8 @@ KIND
mesh_assert_container_running() {
local name="$1"
if [[ "${name}" == *"-hub" ]]; then
- name="sam-hub"
+ kubectl --context="${KUBECONTEXT:-kind-sam-wi-test}" get pod sam-hub-0 -o jsonpath='{.status.phase}' | grep -q "Running"
+ return $?
fi
local state
state="$(docker inspect -f '{{.State.Running}}' "${name}" 2>/dev/null || true)"
diff --git a/tests/e2e/relay.bats b/tests/e2e/relay.bats
index 3b4c7133..bd412435 100644
--- a/tests/e2e/relay.bats
+++ b/tests/e2e/relay.bats
@@ -58,8 +58,10 @@ teardown() {
docker network connect "${MESH_NETWORK_2}" "${hub_node}"
DISCONNECT_CONTAINERS+=("${hub_node}:${MESH_NETWORK_2}")
- docker network connect "${MESH_NETWORK_2}" "${oidc_node}"
- DISCONNECT_CONTAINERS+=("${oidc_node}:${MESH_NETWORK_2}")
+ if [[ "${oidc_node}" != "${hub_node}" ]]; then
+ docker network connect "${MESH_NETWORK_2}" "${oidc_node}"
+ DISCONNECT_CONTAINERS+=("${oidc_node}:${MESH_NETWORK_2}")
+ fi
mesh_start_node "1" "--enable-relay=true --log-level=debug"