From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Heather Lapointe via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "René Scharfe" <l.s.r@web.de>,
"Heather Lapointe" <alpha@alphaservcomputing.solutions>
Subject: Re: [PATCH v3 9/9] archive: add tests for git archive --recurse-submodules
Date: Fri, 28 Oct 2022 02:17:11 +0200 [thread overview]
Message-ID: <221028.86wn8k94pu.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <f88ebbaf17cbf1a0b57336430bd43ade94406f38.1665973401.git.gitgitgadget@gmail.com>
On Mon, Oct 17 2022, Heather Lapointe via GitGitGadget wrote:
> From: Heather Lapointe <alpha@alphaservcomputing.solutions>
[In addition to what others mentioned]
> +test_description='git archive --recurse-submodules test'
> +
> +. ./test-lib.sh
> +
> +check_tar() {
> + tarfile=$1.tar
> + listfile=$1.lst
This "listfile" is used nowhere?"
> + dir=$1
> + dir_with_prefix=$dir/$2
Nor dir_with_prefix?
> +
> + test_expect_success ' extract tar archive' '
> + (mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
Aside from what Jonathan mentioned, maybe we can just use one variable
here then?
mkdir $foo ... <$foo.tar
> + test_expect_success " validate extra file $path_in_archive" '
> + test -f $dir/$path_in_archive &&
Instead use "test_path_is_file", and in general for "test <whatever>"
check out if we have a wrapper in test-lib-functions.sh.
> +check_not_added() {
> + dir=$1
> + path_in_archive=$2
> +
> + test_expect_success " validate unpresent file $path_in_archive" '
> + ! test -f $dir/$path_in_archive &&
> + ! test -d $dir/$path_in_archive
Don't test for what a thing isn't, but what it is. Can't we do that
here?
> +test_expect_success 'setup' '
> + rm -rf repo_with_submodules submodule1 uninited_repo_with_submodules &&
Don't have a test rm -rf stuff from a previous block, but have
"test_when_finished" clean up after that previous test instead.
> + git init repo_with_submodules &&
> + git init submodule1 &&
> + (
> + cd submodule1 &&
This:
> + echo "dir1/sub1/file1.txt" > "file1.txt" &&
> + git add file1.txt &&
> + git commit -m "initialize with file1.txt"
Looks like you can use test_commit instead.
And note you can use -C, so you won't need the sub-shell either, I think.
> + ) &&
> + (
> + cd repo_with_submodules &&
> + echo "file2" > file2.txt &&
> + git add file2.txt &&
> + git commit -m "initialize with file2.txt" &&
Ditto.
> + mkdir -p dir1 &&
Let's drop "-p" here, to check for errors.
> +test_expect_success 'archive with recurse, non-init' '
> + ! git -C uninited_repo_with_submodules archive --recurse-submodules -v HEAD >b2-err.tar
For git, don't use !, use test_must_fail, ! hides segfaults.
Does this test pass when you build with SANITIZE=leak? Then you can do this at the top:
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
If you can't test that locally pushing to GitHub CI will tell you...
next prev parent reply other threads:[~2022-10-28 0:23 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-12 17:52 [PATCH] archive: add --recurse-submodules to git-archive command Heather Lapointe via GitGitGadget
2022-10-13 11:35 ` [PATCH v2 0/2] archive: Add " Heather Lapointe via GitGitGadget
2022-10-13 11:35 ` [PATCH v2 1/2] archive: add " Alphadelta14 via GitGitGadget
2022-10-13 17:53 ` René Scharfe
2022-10-13 21:37 ` Heather Lapointe
2022-10-13 11:36 ` [PATCH v2 2/2] archive: fix a case of submodule in submodule traversal Alphadelta14 via GitGitGadget
2022-10-13 17:53 ` [PATCH v2 0/2] archive: Add --recurse-submodules to git-archive command René Scharfe
2022-10-13 21:23 ` Heather Lapointe
2022-10-14 9:47 ` René Scharfe
2022-10-17 2:23 ` [PATCH v3 0/9] " Heather Lapointe via GitGitGadget
2022-10-17 2:23 ` [PATCH v3 1/9] tree: do not use the_repository for tree traversal methods Alphadelta14 via GitGitGadget
2022-10-17 13:26 ` Junio C Hamano
2022-10-26 22:33 ` Glen Choo
2022-10-27 18:09 ` Jonathan Tan
2022-10-27 18:50 ` Junio C Hamano
2022-10-17 2:23 ` [PATCH v3 2/9] tree: update cases to use repo_ tree methods Heather Lapointe via GitGitGadget
2022-10-17 2:23 ` [PATCH v3 3/9] tree: increase test coverage for tree.c Heather Lapointe via GitGitGadget
2022-10-17 13:34 ` Phillip Wood
2022-10-17 13:36 ` Junio C Hamano
2022-10-27 18:28 ` Jonathan Tan
2022-10-17 2:23 ` [PATCH v3 4/9] tree: handle submodule case for read_tree_at properly Heather Lapointe via GitGitGadget
2022-10-17 13:48 ` Phillip Wood
2022-10-17 13:56 ` Junio C Hamano
2022-10-26 22:48 ` Glen Choo
2022-10-27 18:43 ` Jonathan Tan
2022-10-17 2:23 ` [PATCH v3 5/9] tree: add repository parameter to read_tree_fn_t Heather Lapointe via GitGitGadget
2022-10-17 2:23 ` [PATCH v3 6/9] archive: pass repo objects to write_archive handlers Heather Lapointe via GitGitGadget
2022-10-17 13:50 ` Phillip Wood
2022-10-17 2:23 ` [PATCH v3 7/9] archive: remove global repository from archive_args Heather Lapointe via GitGitGadget
2022-10-17 2:23 ` [PATCH v3 8/9] archive: add --recurse-submodules to git-archive command Heather Lapointe via GitGitGadget
2022-10-26 23:34 ` Glen Choo
2022-10-27 7:09 ` René Scharfe
2022-10-27 17:29 ` Glen Choo
2022-10-27 17:30 ` Glen Choo
2022-10-27 17:33 ` Glen Choo
2022-10-17 2:23 ` [PATCH v3 9/9] archive: add tests for git archive --recurse-submodules Heather Lapointe via GitGitGadget
2022-10-27 18:54 ` Jonathan Tan
2022-10-27 23:30 ` Glen Choo
2022-10-28 0:17 ` Ævar Arnfjörð Bjarmason [this message]
2022-10-17 13:57 ` [PATCH v3 0/9] archive: Add --recurse-submodules to git-archive command Phillip Wood
2022-10-18 18:34 ` Junio C Hamano
2022-10-18 18:48 ` Heather Lapointe
2022-10-19 16:16 ` Junio C Hamano
2022-10-19 20:44 ` Junio C Hamano
2022-10-20 1:21 ` Junio C Hamano
2022-10-21 1:43 ` Junio C Hamano
2022-10-26 22:14 ` Glen Choo
2022-10-28 18:18 ` Heather Lapointe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=221028.86wn8k94pu.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=alpha@alphaservcomputing.solutions \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=l.s.r@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).