mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
svn tests: refactor away a "set -e" in test body
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:
parent
88fce1219e
commit
4f4d2017a3
|
@ -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"
|
||||
>foo &&
|
||||
# for "add props relative"
|
||||
>subdir/foo_subdir &&
|
||||
# for "add props subdir"
|
||||
>"$foo_subdir2" &&
|
||||
svn_cmd import -m "import for git svn" . "$svnrepo"
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'initialize git svn' '
|
||||
git svn init "$svnrepo"
|
||||
|
|
Loading…
Reference in a new issue