mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn tests: refactor away a "set -e" in test body

Browse Source 
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. Let's
move this into a setup test using "test_expect_success" instead.

While I'm at it refactor:

 * Repeated "mkdir" to "mkdir -p"
 * Uses of "touch" to creating the files with ">" instead
 * The "rm -rf" at the end to happen in a "test_when_finished"

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2021-04-12 13:33:26 +02:00
committed by Junio C Hamano
parent 88fce1219e
commit 4f4d2017a3
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
t/t9148-git-svn-propset.sh
View File

@ -7,19 +7,22 @@ test_description='git svn propset tests'
. ./lib-git-svn.sh . ./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 foo_subdir2="subdir/subdir2/foo_subdir2" &&
mkdir import && mkdir -p import/subdir/subdir2 &&
(set -e ; cd import (
mkdir subdir cd import &&
mkdir subdir/subdir2 # for "add props top level"
touch foo # for 'add props top level' >foo &&
touch subdir/foo_subdir # for 'add props relative' # for "add props relative"
touch "$foo_subdir2" # for 'add props subdir' >subdir/foo_subdir &&
svn_cmd import -m 'import for git svn' . "$svnrepo" >/dev/null # for "add props subdir"
) >"$foo_subdir2" &&
rm -rf import svn_cmd import -m "import for git svn" . "$svnrepo"
)
'
test_expect_success 'initialize git svn' ' test_expect_success 'initialize git svn' '
git svn init "$svnrepo" git svn init "$svnrepo"