kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #568 from thockin/v4_ncsvr_http_bug 

v4: e2e: Fix ncsvr to wait for input on HTTP
This commit is contained in:
Kubernetes Prow Robot 2022-07-07 04:27:34 -07:00 committed by GitHub
parent 89c8060026 ec25d1a3f5
commit 37eba714c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_test_tools/ncsvr/ncsvr.sh
View File

@ -20,7 +20,11 @@ if [ -z "$1" -o -z "$2" ]; then
exit 1
fi
F="/tmp/fifo.$RANDOM"
while true; do
sh -c "$2" | nc -l -p "$1" -N -w0 >/dev/null
rm -f "$F"
mkfifo "$F"
cat "$F" | sh -c "$2" 2>&1 | nc -l -p "$1" -N -w1 > "$F"
date >> /var/log/hits
done

32
test_e2e.sh
View File

@ -1074,7 +1074,7 @@ function e2e::auth_askpass_url_wrong_password() {
CTR=$(docker_run \
-v "$HITLOG":/var/log/hits \
e2e/test/test-ncsvr \
80 '
80 'read X
echo "HTTP/1.1 200 OK"
echo
echo "username=my-username"
@ -1107,7 +1107,7 @@ function e2e::auth_askpass_url_correct_password() {
CTR=$(docker_run \
-v "$HITLOG":/var/log/hits \
e2e/test/test-ncsvr \
80 '
80 'read X
echo "HTTP/1.1 200 OK"
echo
echo "username=my-username"
@ -1160,7 +1160,7 @@ function e2e::auth_askpass_url_flaky() {
CTR=$(docker_run \
-v "$HITLOG":/var/log/hits \
e2e/test/test-ncsvr \
80 '
80 'read X
echo "HTTP/1.1 200 OK"
echo
if [ -f /tmp/flag ]; then
@ -1349,7 +1349,9 @@ function e2e::webhook_success() {
CTR=$(docker_run \
-v "$HITLOG":/var/log/hits \
e2e/test/test-ncsvr \
80 'echo "HTTP/1.1 200 OK"')
80 'read X
echo "HTTP/1.1 200 OK"
')
IP=$(docker_ip "$CTR")
echo "$FUNCNAME 1" > "$REPO"/file
git -C "$REPO" commit -qam "$FUNCNAME 1"
@ -1395,7 +1397,9 @@ function e2e::webhook_fail_retry() {
CTR=$(docker_run \
-v "$HITLOG":/var/log/hits \
e2e/test/test-ncsvr \
80 'echo "HTTP/1.1 500 Internal Server Error"')
80 'read X
echo "HTTP/1.1 500 Internal Server Error"
')
IP=$(docker_ip "$CTR")
echo "$FUNCNAME 1" > "$REPO"/file
git -C "$REPO" commit -qam "$FUNCNAME 1"
@ -1424,7 +1428,9 @@ function e2e::webhook_fail_retry() {
--ip="$IP" \
-v "$HITLOG":/var/log/hits \
e2e/test/test-ncsvr \
80 'echo "HTTP/1.1 200 OK"')
80 'read X
echo "HTTP/1.1 200 OK"
')
sleep 2
HITS=$(cat "$HITLOG" | wc -l)
if [[ "$HITS" < 1 ]]; then
@ -1443,7 +1449,10 @@ function e2e::webhook_success_once() {
CTR=$(docker_run \
-v "$HITLOG":/var/log/hits \
e2e/test/test-ncsvr \
80 'sleep 3 && echo "HTTP/1.1 200 OK"')
80 'read X
sleep 3
echo "HTTP/1.1 200 OK"
')
IP=$(docker_ip "$CTR")
echo "$FUNCNAME 1" > "$REPO"/file
git -C "$REPO" commit -qam "$FUNCNAME 1"
@ -1478,7 +1487,10 @@ function e2e::webhook_fail_retry_once() {
CTR=$(docker_run \
-v "$HITLOG":/var/log/hits \
e2e/test/test-ncsvr \
80 'sleep 3 && echo "HTTP/1.1 500 Internal Server Error"')
80 'read X
sleep 3
echo "HTTP/1.1 500 Internal Server Error"
')
IP=$(docker_ip "$CTR")
echo "$FUNCNAME 1" > "$REPO"/file
git -C "$REPO" commit -qam "$FUNCNAME 1"
@ -1512,7 +1524,9 @@ function e2e::webhook_fire_and_forget() {
CTR=$(docker_run \
-v "$HITLOG":/var/log/hits \
e2e/test/test-ncsvr \
80 'echo "HTTP/1.1 404 Not Found"')
80 'read X
echo "HTTP/1.1 404 Not Found"
')
IP=$(docker_ip "$CTR")
# First sync