mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-08 14:43:27 -04:00
dev-python/{anthropic,openai}: mitigate src_test PID reuse race
Signed-off-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
This commit is contained in:
@@ -123,9 +123,15 @@ src_test() {
|
|||||||
"${DISTDIR}/${API_SPEC}" &> .stdy.log &
|
"${DISTDIR}/${API_SPEC}" &> .stdy.log &
|
||||||
local mock_pid=$!
|
local mock_pid=$!
|
||||||
|
|
||||||
|
is_mock_running() {
|
||||||
|
local -a args
|
||||||
|
readarray -d '' args < "/proc/${mock_pid}/cmdline" 2>/dev/null || return 1
|
||||||
|
[[ "${args[1]}" == "${mock}" ]]
|
||||||
|
}
|
||||||
|
|
||||||
local attempts=0
|
local attempts=0
|
||||||
while ! curl -sf "http://127.0.0.1:4010/_x-steady/health" &>/dev/null; do
|
while ! curl -sf "http://127.0.0.1:4010/_x-steady/health" &>/dev/null; do
|
||||||
if ! kill -0 ${mock_pid} 2>/dev/null; then
|
if ! is_mock_running; then
|
||||||
cat .stdy.log
|
cat .stdy.log
|
||||||
die "Mock server failed to start"
|
die "Mock server failed to start"
|
||||||
fi
|
fi
|
||||||
@@ -137,13 +143,18 @@ src_test() {
|
|||||||
sleep 0.1
|
sleep 0.1
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Oops; connected to another Steady instance running on 4010
|
||||||
|
is_mock_running || die
|
||||||
|
|
||||||
popd >/dev/null || die
|
popd >/dev/null || die
|
||||||
|
|
||||||
nonfatal distutils-r1_src_test
|
nonfatal distutils-r1_src_test
|
||||||
local ret=${?}
|
local ret=${?}
|
||||||
|
|
||||||
einfo "Stopping mock server..."
|
if is_mock_running; then
|
||||||
kill "${mock_pid}" || die
|
einfo "Stopping mock server..."
|
||||||
|
kill "${mock_pid}" || die
|
||||||
|
fi
|
||||||
|
|
||||||
[[ ${ret} -ne 0 ]] && die
|
[[ ${ret} -ne 0 ]] && die
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -120,9 +120,15 @@ src_test() {
|
|||||||
"${DISTDIR}/${API_SPEC}" &> .stdy.log &
|
"${DISTDIR}/${API_SPEC}" &> .stdy.log &
|
||||||
local mock_pid=$!
|
local mock_pid=$!
|
||||||
|
|
||||||
|
is_mock_running() {
|
||||||
|
local -a args
|
||||||
|
readarray -d '' args < "/proc/${mock_pid}/cmdline" 2>/dev/null || return 1
|
||||||
|
[[ "${args[1]}" == "${mock}" ]]
|
||||||
|
}
|
||||||
|
|
||||||
local attempts=0
|
local attempts=0
|
||||||
while ! curl -sf "http://127.0.0.1:4010/_x-steady/health" &>/dev/null; do
|
while ! curl -sf "http://127.0.0.1:4010/_x-steady/health" &>/dev/null; do
|
||||||
if ! kill -0 ${mock_pid} 2>/dev/null; then
|
if ! is_mock_running; then
|
||||||
cat .stdy.log
|
cat .stdy.log
|
||||||
die "Mock server failed to start"
|
die "Mock server failed to start"
|
||||||
fi
|
fi
|
||||||
@@ -134,13 +140,18 @@ src_test() {
|
|||||||
sleep 0.1
|
sleep 0.1
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Oops; connected to another Steady instance running on 4010
|
||||||
|
is_mock_running || die
|
||||||
|
|
||||||
popd >/dev/null || die
|
popd >/dev/null || die
|
||||||
|
|
||||||
nonfatal distutils-r1_src_test
|
nonfatal distutils-r1_src_test
|
||||||
local ret=${?}
|
local ret=${?}
|
||||||
|
|
||||||
einfo "Stopping mock server..."
|
if is_mock_running; then
|
||||||
kill "${mock_pid}" || die
|
einfo "Stopping mock server..."
|
||||||
|
kill "${mock_pid}" || die
|
||||||
|
fi
|
||||||
|
|
||||||
[[ ${ret} -ne 0 ]] && die
|
[[ ${ret} -ne 0 ]] && die
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user