Rebrand upstream: переименовать forkop в tachyon
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/usr/bin/env bash
|
||||
set -eo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
FORKOP_LIB="$ROOT_DIR/forkop/files/usr/lib"
|
||||
STATE_UC="$ROOT_DIR/forkop/files/usr/lib/service/state.uc"
|
||||
NFT_UC="$ROOT_DIR/forkop/files/usr/lib/nft/apply.uc"
|
||||
TACHYON_LIB="$ROOT_DIR/tachyon/files/usr/lib"
|
||||
STATE_UC="$ROOT_DIR/tachyon/files/usr/lib/service/state.uc"
|
||||
NFT_UC="$ROOT_DIR/tachyon/files/usr/lib/nft/apply.uc"
|
||||
UCODE_BIN="$(command -v ucode)"
|
||||
WORK_DIR="$(mktemp -d)"
|
||||
export ZAPRET_DEFAULT_NFQWS_OPT="--default-zapret"
|
||||
export ZAPRET2_DEFAULT_NFQWS2_OPT="--default-zapret2"
|
||||
export BYEDPI_DEFAULT_CMD_OPTS="--default-bye"
|
||||
export FORKOP_FAKE_INIT_CAPTURE="$WORK_DIR/pending-reload-init.args"
|
||||
export TACHYON_FAKE_INIT_CAPTURE="$WORK_DIR/pending-reload-init.args"
|
||||
|
||||
cleanup() {
|
||||
rm -rf "$WORK_DIR"
|
||||
@@ -35,11 +35,11 @@ md5_file() {
|
||||
}
|
||||
|
||||
state_ucode() {
|
||||
ucode -L "$FORKOP_LIB" "$STATE_UC" "$@"
|
||||
ucode -L "$TACHYON_LIB" "$STATE_UC" "$@"
|
||||
}
|
||||
|
||||
nft_ucode() {
|
||||
ucode -L "$FORKOP_LIB" "$NFT_UC" "$@"
|
||||
ucode -L "$TACHYON_LIB" "$NFT_UC" "$@"
|
||||
}
|
||||
|
||||
state_ucode list-has-remote-references "local.lst https://example.com/list.txt" >/dev/null ||
|
||||
@@ -183,15 +183,15 @@ fi
|
||||
if ! PATH="$WORK_DIR/stable-start-bin:$PATH" \
|
||||
REAL_UCODE="$UCODE_BIN" \
|
||||
SING_BOX_TEST_PID_FILE="$WORK_DIR/sing-box.pid" \
|
||||
state_ucode forkop-running forkop ForkopTable 0x00100000; then
|
||||
state_ucode tachyon-running tachyon TachyonTable 0x00100000; then
|
||||
kill "$sing_box_pid" >/dev/null 2>&1 || true
|
||||
wait "$sing_box_pid" 2>/dev/null || true
|
||||
fail "stable-start fixture must expose configured Forkop networking"
|
||||
fail "stable-start fixture must expose configured Tachyon networking"
|
||||
fi
|
||||
if ! PATH="$WORK_DIR/stable-start-bin:$PATH" \
|
||||
REAL_UCODE="$UCODE_BIN" \
|
||||
SING_BOX_TEST_PID_FILE="$WORK_DIR/sing-box.pid" \
|
||||
state_ucode wait-forkop-stable-start forkop ForkopTable 0x00100000 2 2; then
|
||||
state_ucode wait-tachyon-stable-start tachyon TachyonTable 0x00100000 2 2; then
|
||||
kill "$sing_box_pid" >/dev/null 2>&1 || true
|
||||
wait "$sing_box_pid" 2>/dev/null || true
|
||||
fail "stable-start wait must check runtime state after its final sleep"
|
||||
@@ -217,17 +217,17 @@ fi
|
||||
|
||||
cat >"$WORK_DIR/fake-init" <<'SH'
|
||||
#!/bin/sh
|
||||
printf '%s\n' "$1" >"$FORKOP_FAKE_INIT_CAPTURE"
|
||||
printf '%s\n' "$1" >"$TACHYON_FAKE_INIT_CAPTURE"
|
||||
SH
|
||||
chmod +x "$WORK_DIR/fake-init"
|
||||
state_ucode mark-pending-reload "$PENDING_RELOAD_FILE" "reload_busy"
|
||||
state_ucode run-pending-reload-if-requested "$PENDING_RELOAD_FILE" "$WORK_DIR/fake-init"
|
||||
for _ in $(seq 1 20); do
|
||||
[ -s "$FORKOP_FAKE_INIT_CAPTURE" ] && break
|
||||
[ -s "$TACHYON_FAKE_INIT_CAPTURE" ] && break
|
||||
sleep 0.1
|
||||
done
|
||||
assert_eq "reload" \
|
||||
"$(cat "$FORKOP_FAKE_INIT_CAPTURE")" \
|
||||
"$(cat "$TACHYON_FAKE_INIT_CAPTURE")" \
|
||||
"pending reload should invoke init.d reload"
|
||||
[ ! -e "$PENDING_RELOAD_FILE" ] ||
|
||||
fail "pending reload should be consumed when worker is started"
|
||||
@@ -294,9 +294,9 @@ cat >"$WORK_DIR/service-dns-state.json" <<'JSON'
|
||||
"server": [ "1.1.1.1#53", "8.8.8.8" ],
|
||||
"noresolv": "1",
|
||||
"cachesize": "0",
|
||||
"forkop_server": [ "127.0.0.42#53" ],
|
||||
"forkop_noresolv": "0",
|
||||
"forkop_cachesize": "1500"
|
||||
"tachyon_server": [ "127.0.0.42#53" ],
|
||||
"tachyon_noresolv": "0",
|
||||
"tachyon_cachesize": "1500"
|
||||
},
|
||||
"legacy_dnsmasq_present": true
|
||||
}
|
||||
@@ -320,13 +320,13 @@ cat >"$WORK_DIR/dnsmasq-signature.expected" <<'EOF_DNSMASQ_SIG'
|
||||
1
|
||||
[dhcp.@dnsmasq[0].cachesize]
|
||||
0
|
||||
[dhcp.@dnsmasq[0].forkop_server]
|
||||
[dhcp.@dnsmasq[0].tachyon_server]
|
||||
127.0.0.42#53
|
||||
[dhcp.@dnsmasq[0].forkop_noresolv]
|
||||
[dhcp.@dnsmasq[0].tachyon_noresolv]
|
||||
0
|
||||
[dhcp.@dnsmasq[0].forkop_cachesize]
|
||||
[dhcp.@dnsmasq[0].tachyon_cachesize]
|
||||
1500
|
||||
[dhcp.forkop.present]
|
||||
[dhcp.tachyon.present]
|
||||
1
|
||||
EOF_DNSMASQ_SIG
|
||||
|
||||
|
||||
Reference in New Issue
Block a user