facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

mononoke: update test-lfs-server-proxy-skip-upstream.t to be more deterministic

Browse Source 
Summary:
Looks like most of our tests got slower recently, and this particular test
started failing as a result since it's sensitive to timing. Unlike when this
test was written, we can now get a little more info from Mononoke LFS by
looking at Scuba logs, to know if we went to upstream or not. So, let's do
that.

Reviewed By: HarveyHunt

Differential Revision: D19790000

fbshipit-source-id: 5617b088595c911018166d2c13eb43dc6adca60b
This commit is contained in:
Thomas Orozco 2020-02-10 01:39:03 -08:00 committed by Facebook Github Bot
parent 3bd05c344c
commit 46037e13d0
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eden/mononoke/tests/integration/test-lfs-server-proxy-skip-upstream.t
View File

@ -13,12 +13,13 @@
# Start a "server" that never responds as the upstream
$ upstream_port="$(get_free_socket)"
$ upstream="http://127.0.0.1:${upstream_port}/"
$ nc --sh-exec "sleep 4" --keep-open --listen 127.0.0.1 "$upstream_port" &
$ nc --sh-exec "sleep 1" --keep-open --listen 127.0.0.1 "$upstream_port" &
$ nc_pid="$!"
# Start a LFS server
$ scuba_proxy="$TESTTMP/scuba.json"
$ log_proxy="$TESTTMP/lfs_proxy.log"
$ lfs_proxy="$(lfs_server --upstream "$upstream" --log "$log_proxy")/lfs_repo"
$ lfs_proxy="$(lfs_server --upstream "$upstream" --log "$log_proxy" --scuba-log-file "$scuba_proxy")/lfs_repo"
# Import a blob
$ LFS_HELPER="$(realpath "${TESTTMP}/lfs")"
@ -49,21 +50,31 @@
OUT < POST /lfs_repo/objects/batch 200 OK
IN > GET /lfs_repo/download/d28548bc21aabf04d143886d717d72375e3deecd0dafb3d110676b70a192cb5d -
OUT < GET /lfs_repo/download/d28548bc21aabf04d143886d717d72375e3deecd0dafb3d110676b70a192cb5d 200 OK
$ wait_for_json_record_count "$scuba_proxy" 2
$ jq -S .normal.batch_order < "$scuba_proxy"
"internal"
null
$ truncate -s 0 "$log_proxy"
$ truncate -s 0 "$scuba_proxy"
# Downloading a missing blob should however wait (we check that we took ~4 seconds for this)
$ time hg --config extensions.lfs= debuglfsreceive 0000000000000000000000000000000000000000000000000000000000000000 2048 "$lfs_proxy"
$ hg --config extensions.lfs= debuglfsreceive 0000000000000000000000000000000000000000000000000000000000000000 2048 "$lfs_proxy"
abort: LFS HTTP error: HTTP Error 502: Bad Gateway (action=download)!
real*0m4.* (glob)
user* (glob)
sys* (glob)
[255]
$ cat "$log_proxy"
IN > POST /lfs_repo/objects/batch -
OUT < POST /lfs_repo/objects/batch 502 Bad Gateway
$ wait_for_json_record_count "$scuba_proxy" 1
$ jq -S .normal.batch_order < "$scuba_proxy"
"both"
$ truncate -s 0 "$log_proxy"
$ truncate -s 0 "$scuba_proxy"
# Kill nc, otherwise we don't exit properly :/
$ kill -KILL "$nc_pid"