tests: fix isolation t-t- bug, restore SUB=livetest for invoke/update/stress (router ns)
This commit is contained in:
@@ -11,7 +11,7 @@ source "${ROOT_DIR}/lib.sh"
|
|||||||
|
|
||||||
RUN_ID=$(mk_run_id)
|
RUN_ID=$(mk_run_id)
|
||||||
# Используем прогретый namespace — fission router его знает.
|
# Используем прогретый namespace — fission router его знает.
|
||||||
SUB="test-livetest@test.local"
|
SUB="livetest@test.local"
|
||||||
FN_NODE="t-node-fn-${RUN_ID}"
|
FN_NODE="t-node-fn-${RUN_ID}"
|
||||||
FN_PY="t-py-fn-${RUN_ID}"
|
FN_PY="t-py-fn-${RUN_ID}"
|
||||||
|
|
||||||
|
|||||||
@@ -91,14 +91,14 @@ ALICE_HAS_OWN=$(printf '%s' "$ALICE_LIST" | python3 -c "
|
|||||||
import json, sys
|
import json, sys
|
||||||
try:
|
try:
|
||||||
fns = json.load(sys.stdin)
|
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:
|
except:
|
||||||
print(0)" 2>/dev/null)
|
print(0)" 2>/dev/null)
|
||||||
ALICE_HAS_BOB=$(printf '%s' "$ALICE_LIST" | python3 -c "
|
ALICE_HAS_BOB=$(printf '%s' "$ALICE_LIST" | python3 -c "
|
||||||
import json, sys
|
import json, sys
|
||||||
try:
|
try:
|
||||||
fns = json.load(sys.stdin)
|
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:
|
except:
|
||||||
print(0)" 2>/dev/null)
|
print(0)" 2>/dev/null)
|
||||||
|
|
||||||
@@ -110,14 +110,14 @@ BOB_HAS_OWN=$(printf '%s' "$BOB_LIST" | python3 -c "
|
|||||||
import json, sys
|
import json, sys
|
||||||
try:
|
try:
|
||||||
fns = json.load(sys.stdin)
|
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:
|
except:
|
||||||
print(0)" 2>/dev/null)
|
print(0)" 2>/dev/null)
|
||||||
BOB_HAS_ALICE=$(printf '%s' "$BOB_LIST" | python3 -c "
|
BOB_HAS_ALICE=$(printf '%s' "$BOB_LIST" | python3 -c "
|
||||||
import json, sys
|
import json, sys
|
||||||
try:
|
try:
|
||||||
fns = json.load(sys.stdin)
|
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:
|
except:
|
||||||
print(0)" 2>/dev/null)
|
print(0)" 2>/dev/null)
|
||||||
|
|
||||||
@@ -133,7 +133,7 @@ import json, sys
|
|||||||
try:
|
try:
|
||||||
fns = json.load(sys.stdin)
|
fns = json.load(sys.stdin)
|
||||||
for f in fns:
|
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',''))
|
print(f.get('spec',{}).get('relativeurl',''))
|
||||||
break
|
break
|
||||||
except:
|
except:
|
||||||
@@ -144,7 +144,7 @@ import json, sys
|
|||||||
try:
|
try:
|
||||||
fns = json.load(sys.stdin)
|
fns = json.load(sys.stdin)
|
||||||
for f in fns:
|
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',''))
|
print(f.get('spec',{}).get('relativeurl',''))
|
||||||
break
|
break
|
||||||
except:
|
except:
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ NS_CLEANUP_SCRIPT="${ROOT_DIR}/cleanup_test_namespaces.sh"
|
|||||||
RUN_ID=$(mk_run_id)
|
RUN_ID=$(mk_run_id)
|
||||||
COUNT="${1:-8}"
|
COUNT="${1:-8}"
|
||||||
TMP=$(mktemp -d)
|
TMP=$(mktemp -d)
|
||||||
INVOKE_SUB="test-livetest@test.local"
|
INVOKE_SUB="livetest@test.local"
|
||||||
INVOKE_COUNT=8
|
INVOKE_COUNT=8
|
||||||
|
|
||||||
declare -a SUBS=()
|
declare -a SUBS=()
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ ROOT_DIR=$(cd "$(dirname "$0")" && pwd)
|
|||||||
source "${ROOT_DIR}/lib.sh"
|
source "${ROOT_DIR}/lib.sh"
|
||||||
|
|
||||||
RUN_ID=$(mk_run_id)
|
RUN_ID=$(mk_run_id)
|
||||||
SUB="test-livetest@test.local"
|
SUB="livetest@test.local"
|
||||||
FN="t-upd-fn-${RUN_ID}"
|
FN="t-upd-fn-${RUN_ID}"
|
||||||
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
|
|||||||
Reference in New Issue
Block a user