From 6b6190635a57f079d17e21c9d3ed3094e324af79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= Date: Sun, 3 May 2026 20:17:13 +0400 Subject: [PATCH] tests: fix isolation t-t- bug, restore SUB=livetest for invoke/update/stress (router ns) --- scripts/test_invoke.sh | 2 +- scripts/test_isolation.sh | 12 ++++++------ scripts/test_stress.sh | 2 +- scripts/test_update.sh | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/test_invoke.sh b/scripts/test_invoke.sh index f2663cb..d8055fd 100755 --- a/scripts/test_invoke.sh +++ b/scripts/test_invoke.sh @@ -11,7 +11,7 @@ source "${ROOT_DIR}/lib.sh" RUN_ID=$(mk_run_id) # Используем прогретый namespace — fission router его знает. -SUB="test-livetest@test.local" +SUB="livetest@test.local" FN_NODE="t-node-fn-${RUN_ID}" FN_PY="t-py-fn-${RUN_ID}" diff --git a/scripts/test_isolation.sh b/scripts/test_isolation.sh index 27293f5..4cd1522 100755 --- a/scripts/test_isolation.sh +++ b/scripts/test_isolation.sh @@ -91,14 +91,14 @@ ALICE_HAS_OWN=$(printf '%s' "$ALICE_LIST" | python3 -c " import json, sys try: fns = json.load(sys.stdin) - print(sum(1 for f in fns if f.get('metadata',{}).get('name','') == 't-t-alice-fn')) + print(sum(1 for f in fns if f.get('metadata',{}).get('name','') == 't-alice-fn')) except: print(0)" 2>/dev/null) ALICE_HAS_BOB=$(printf '%s' "$ALICE_LIST" | python3 -c " import json, sys try: fns = json.load(sys.stdin) - print(sum(1 for f in fns if f.get('metadata',{}).get('name','') == 't-t-bob-fn')) + print(sum(1 for f in fns if f.get('metadata',{}).get('name','') == 't-bob-fn')) except: print(0)" 2>/dev/null) @@ -110,14 +110,14 @@ BOB_HAS_OWN=$(printf '%s' "$BOB_LIST" | python3 -c " import json, sys try: fns = json.load(sys.stdin) - print(sum(1 for f in fns if f.get('metadata',{}).get('name','') == 't-t-bob-fn')) + print(sum(1 for f in fns if f.get('metadata',{}).get('name','') == 't-bob-fn')) except: print(0)" 2>/dev/null) BOB_HAS_ALICE=$(printf '%s' "$BOB_LIST" | python3 -c " import json, sys try: fns = json.load(sys.stdin) - print(sum(1 for f in fns if f.get('metadata',{}).get('name','') == 't-t-alice-fn')) + print(sum(1 for f in fns if f.get('metadata',{}).get('name','') == 't-alice-fn')) except: print(0)" 2>/dev/null) @@ -133,7 +133,7 @@ import json, sys try: fns = json.load(sys.stdin) for f in fns: - if f.get('metadata',{}).get('name','') == 't-t-alice-fn': + if f.get('metadata',{}).get('name','') == 't-alice-fn': print(f.get('spec',{}).get('relativeurl','')) break except: @@ -144,7 +144,7 @@ import json, sys try: fns = json.load(sys.stdin) for f in fns: - if f.get('metadata',{}).get('name','') == 't-t-bob-fn': + if f.get('metadata',{}).get('name','') == 't-bob-fn': print(f.get('spec',{}).get('relativeurl','')) break except: diff --git a/scripts/test_stress.sh b/scripts/test_stress.sh index 4fca7ed..872f905 100755 --- a/scripts/test_stress.sh +++ b/scripts/test_stress.sh @@ -13,7 +13,7 @@ NS_CLEANUP_SCRIPT="${ROOT_DIR}/cleanup_test_namespaces.sh" RUN_ID=$(mk_run_id) COUNT="${1:-8}" TMP=$(mktemp -d) -INVOKE_SUB="test-livetest@test.local" +INVOKE_SUB="livetest@test.local" INVOKE_COUNT=8 declare -a SUBS=() diff --git a/scripts/test_update.sh b/scripts/test_update.sh index b93d14d..1cf8b2f 100755 --- a/scripts/test_update.sh +++ b/scripts/test_update.sh @@ -11,7 +11,7 @@ ROOT_DIR=$(cd "$(dirname "$0")" && pwd) source "${ROOT_DIR}/lib.sh" RUN_ID=$(mk_run_id) -SUB="test-livetest@test.local" +SUB="livetest@test.local" FN="t-upd-fn-${RUN_ID}" cleanup() {