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>

diff --git a/t/t9148-git-svn-propset.sh b/t/t9148-git-svn-propset.sh
index 102639090c11f3548b1c2b1b391a04b8b0cf05ba..aebb28995e50a0a589e8fff33997d9816de1fdb2 100755 (executable)
--- 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"
+               >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"