Re: [PATCH v3 07/24] multi-pack-index: expand test data
- From
Derrick Stolee <stolee@gmail.com>
- Date
- Jul 12, 2018, 14:10 UTC
- Message-ID
- <3e82dd51-2e30-291f-8753-c1d711459c1d@gmail.com>
- In-Reply-To
- <CAPig+cTO=UPuCRUAAWfBwaNhRD+=dgSwpgEB2fQJuWyFEd7Aew@mail.gmail.com>
On 7/6/2018 12:36 AM, Eric Sunshine wrote:
Show 27 quoted lines
> On Thu, Jul 5, 2018 at 8:54 PM Derrick Stolee <stolee@gmail.com> wrote:
>
>> + for i in $(test_seq 6 10)
>> + do
>> + iii=$(printf '%03i' $i)
>> + test-tool genrandom "bar" 200 >wide_delta_$iii &&
>> + test-tool genrandom "baz $iii" 50 >>wide_delta_$iii &&
>> + test-tool genrandom "foo"$i 100 >deep_delta_$iii &&
>> + test-tool genrandom "foo"$(expr $i + 1) 100 >>deep_delta_$iii &&
>> + test-tool genrandom "foo"$(expr $i + 2) 100 >>deep_delta_$iii &&
>> + echo $iii >file_$iii &&
>> + test-tool genrandom "$iii" 8192 >>file_$iii &&
>> + git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
>> + i=$(expr $i + 1) || return 1
>> + done &&
>> + { echo 101 && test-tool genrandom 100 8192; } >file_101 &&
>> + git update-index --add file_101 &&
>> + tree=$(git write-tree) &&
>> + commit=$(git commit-tree $tree -p HEAD</dev/null) && {
>> + echo $tree &&
>> + git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
>> + } >obj-list2 &&
>> + git update-ref HEAD $commit
>> +'
> There seems to be a fair bit of duplication in these tests which
> create objects. Is it possible to factor out some of this code into a
> shell function?In addition to the other small changes, this refactor in particular was a big change (but a good one). I'm sending my current progress in this direction, as I expect this can be improved.
To make the commit_and_list_objects method more generic to all situations, I had to add an extra commit, which will cause some of the numbers to change in the later 'midx_read_expect' calls.
Thanks,
-Stolee
-->8--
From cb38bb284fd05cf2230725b6cb9ead5795c913f2 Mon Sep 17 00:00:00 2001 From: Derrick Stolee <dstolee@microsoft.com> Date: Thu, 31 May 2018 15:05:00 -0400 Subject: [PATCH] t5319: expand test data
As we build the multi-pack-index file format, we want to test the format on real repositories. Add tests that create repository data including multiple packfiles with both version 1 and version 2 formats.
The current 'git multi-pack-index write' command will always write the same file with no "real" data. This will be expanded in future commits, along with the test expectations.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com> --- t/t5319-multi-pack-index.sh | 83 +++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh index 2ecc369529..a50be41bc0 100755 --- a/t/t5319-multi-pack-index.sh +++ b/t/t5319-multi-pack-index.sh @@ -13,9 +13,92 @@ midx_read_expect () { } test_expect_success 'write midx with no packs' ' + test_when_finished rm -f pack/multi-pack-index && git multi-pack-index --object-dir=. write && test_path_is_file pack/multi-pack-index && midx_read_expect ' +generate_objects () { + i=$1 + iii=$(printf '%03i' $i) + { + test-tool genrandom "bar" 200 && + test-tool genrandom "baz $iii" 50 + } >wide_delta_$iii && + { + test-tool genrandom "foo"$i 100 && + test-tool genrandom "foo"$(( $i + 1 )) 100 && + test-tool genrandom "foo"$(( $i + 2 )) 100 + } >>deep_delta_$iii && + echo $iii >file_$iii && + test-tool genrandom "$iii" 8192 >>file_$iii && + git update-index --add file_$iii deep_delta_$iii wide_delta_$iii +} + +commit_and_list_objects () { + { + echo 101 && + test-tool genrandom 100 8192; + } >file_101 && + git update-index --add file_101 && + tree=$(git write-tree) && + commit=$(git commit-tree $tree -p HEAD</dev/null) && + { + echo $tree && + git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/" + } >obj-list && + git reset --hard $commit +} + +test_expect_success 'create objects' ' + test_commit initial && + for i in $(test_seq 1 5) + do + generate_objects $i + done && + commit_and_list_objects +' + +test_expect_success 'write midx with one v1 pack' ' + pack=$(git pack-objects --index-version=1 pack/test <obj-list) && + test_when_finished rm pack/test-$pack.pack pack/test-$pack.idx pack/multi-pack-index && + git multi-pack-index --object-dir=. write && + midx_read_expect +' + +test_expect_success 'write midx with one v2 pack' ' + git pack-objects --index-version=2,0x40 pack/test <obj-list && + git multi-pack-index --object-dir=. write && + midx_read_expect +' + +test_expect_success 'add more objects' ' + for i in $(test_seq 6 10) + do + generate_objects $i + done && + commit_and_list_objects +' + +test_expect_success 'write midx with two packs' ' + git pack-objects --index-version=1 pack/test-2 <obj-list && + git multi-pack-index --object-dir=. write && + midx_read_expect +' + +test_expect_success 'add more packs' ' + for j in $(test_seq 1 10) + do + generate_objects $j && + commit_and_list_objects && + git pack-objects --index-version=2 test-pack <obj-list + done +' + +test_expect_success 'write midx with twelve packs' ' + git multi-pack-index --object-dir=. write && + midx_read_expect +' + test_done -- 2.18.0.118.gd4f65b8d14