| Message ID | 20210228195414.21372-10-avarab@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | describe: dont abort too early when searching tags | expand |
Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote: > Refactor a test added in 83c9433e67 (git-svn: support for git-svn > propset, 2014-12-07) to avoid using "set -e" in the test body. This > would have broken in combination with a subsequent change to make > "test_expect_success" return 1 to catch such cases. > > While I'm at it rewrite the test to conform to a modern style in our > tests, using the "test_when_finished" function for the "rm -rf", and > avoiding repeated "mkdir" in favor of "mkdir -p". Thank you for working on these (and sorry for making a mess all those years ago!). I had it in my mind that "mkdir -p" wasn't portable, but systems without it probably haven't been relevant since pre-git times. > --- a/t/t9148-git-svn-propset.sh > +++ b/t/t9148-git-svn-propset.sh > @@ -7,19 +7,22 @@ test_description='git svn propset tests' > > . ./lib-git-svn.sh > > -foo_subdir2="subdir/subdir2/foo_subdir2" > +test_expect_success 'setup propset via import' ' > + test_when_finished "rm -rf import" && > > -set -e > -mkdir import && > -(set -e ; cd import > - mkdir subdir > - mkdir subdir/subdir2 > - touch foo # for 'add props top level' > - touch subdir/foo_subdir # for 'add props relative' > - touch "$foo_subdir2" # for 'add props subdir' > - svn_cmd import -m 'import for git svn' . "$svnrepo" >/dev/null > -) > -rm -rf import > + foo_subdir2="subdir/subdir2/foo_subdir2" && > + mkdir -p import/subdir/subdir2 && > + ( > + cd import && > + # for "add props top level" > + touch foo && > + # for "add props relative" > + touch subdir/foo_subdir && > + # for "add props subdir" > + touch "$foo_subdir2" && > + svn_cmd import -m "import for git svn" . "$svnrepo" I've noticed '>' could be used instead of touch, but that's probably better as another patch :>
diff --git a/t/t9148-git-svn-propset.sh b/t/t9148-git-svn-propset.sh index 102639090c..2b55e76be6 100755 --- a/t/t9148-git-svn-propset.sh +++ b/t/t9148-git-svn-propset.sh @@ -7,19 +7,22 @@ test_description='git svn propset tests' . ./lib-git-svn.sh -foo_subdir2="subdir/subdir2/foo_subdir2" +test_expect_success 'setup propset via import' ' + test_when_finished "rm -rf import" && -set -e -mkdir import && -(set -e ; cd import - mkdir subdir - mkdir subdir/subdir2 - touch foo # for 'add props top level' - touch subdir/foo_subdir # for 'add props relative' - touch "$foo_subdir2" # for 'add props subdir' - svn_cmd import -m 'import for git svn' . "$svnrepo" >/dev/null -) -rm -rf import + foo_subdir2="subdir/subdir2/foo_subdir2" && + mkdir -p import/subdir/subdir2 && + ( + cd import && + # for "add props top level" + touch foo && + # for "add props relative" + touch subdir/foo_subdir && + # for "add props subdir" + touch "$foo_subdir2" && + svn_cmd import -m "import for git svn" . "$svnrepo" + ) +' test_expect_success 'initialize git svn' ' git svn init "$svnrepo"
Refactor a test added in 83c9433e67 (git-svn: support for git-svn propset, 2014-12-07) to avoid using "set -e" in the test body. This would have broken in combination with a subsequent change to make "test_expect_success" return 1 to catch such cases. While I'm at it rewrite the test to conform to a modern style in our tests, using the "test_when_finished" function for the "rm -rf", and avoiding repeated "mkdir" in favor of "mkdir -p". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- t/t9148-git-svn-propset.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)