Junio C Hamano <gitster@xxxxxxxxx> writes: > Jonathan Tan <jonathantanmy@xxxxxxxxxx> writes: > >> diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh >> index 7d5b17909b..8b8fb43dbc 100755 >> ... >> + sane_unset GIT_TEST_SIDEBAND_ALL && >> + git -c protocol.version=2 -c transfer.fsckobjects=1 \ >> + -c fetch.uriprotocols=http,https \ >> + clone "$HTTPD_URL/smart/http_parent" http_child && >> + >> + # Ensure that there are exactly 4 files (2 .pack and 2 .idx). > > Ehh, please don't. We may add multi-pack-index there, or perhaps > reverse index files in the future. If you care about having two > packs logically because you are exercising the out-of-band > prepackaged packfile plus the dynamic transfer, make sure you have > two packs (and probably the idx files that go with them). Don't > assume there will be one .idx each for them *AND* nothing else > there. > >> + ls http_child/.git/objects/pack/* >filelist && >> + test_line_count = 4 filelist >> +' > > IOW, > > d=http_child/.git/objects/pack/ > ls "$d"/*.pack "$d"/*.idx >filelist && > test_line_count = 4 filelist > > or something like that. FYI, I have the following queued to make the tip of 'seen' pass the tests. ---- >8 -------- >8 -------- >8 -------- >8 -------- >8 -------- >8 ---- From: Junio C Hamano <gitster@xxxxxxxxx> Date: Mon, 25 Jan 2021 17:27:10 -0800 Subject: [PATCH] SQUASH??? test fix --- t/t5702-protocol-v2.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh index 8b8fb43dbc..b1bc73a9a9 100755 --- a/t/t5702-protocol-v2.sh +++ b/t/t5702-protocol-v2.sh @@ -847,8 +847,9 @@ test_expect_success 'part of packfile response provided as URI' ' test -f hfound && test -f h2found && - # Ensure that there are exactly 6 files (3 .pack and 3 .idx). - ls http_child/.git/objects/pack/* >filelist && + # Ensure that there are exactly 3 packfiles with associated .idx + ls http_child/.git/objects/pack/*.pack \ + http_child/.git/objects/pack/*.idx >filelist && test_line_count = 6 filelist ' @@ -901,8 +902,9 @@ test_expect_success 'packfile-uri with transfer.fsckobjects' ' -c fetch.uriprotocols=http,https \ clone "$HTTPD_URL/smart/http_parent" http_child && - # Ensure that there are exactly 4 files (2 .pack and 2 .idx). - ls http_child/.git/objects/pack/* >filelist && + # Ensure that there are exactly 2 packfiles with associated .idx + ls http_child/.git/objects/pack/*.pack \ + http_child/.git/objects/pack/*.idx >filelist && test_line_count = 4 filelist ' @@ -956,8 +958,9 @@ test_expect_success 'packfile-uri with transfer.fsckobjects succeeds when .gitmo -c fetch.uriprotocols=http,https \ clone "$HTTPD_URL/smart/http_parent" http_child && - # Ensure that there are exactly 4 files (2 .pack and 2 .idx). - ls http_child/.git/objects/pack/* >filelist && + # Ensure that there are exactly 2 packfiles with associated .idx + ls http_child/.git/objects/pack/*.pack \ + http_child/.git/objects/pack/*.idx >filelist && test_line_count = 4 filelist ' -- 2.30.0-509-gbbf2750a06
