git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 0/2] svn tests: trivial "set -e" in main body of test fixes

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Apr 12, 2021, 11:33 UTC
Message-ID
<cover-0.2-00000000000-20210412T113247Z-avarab@gmail.com>
In-Reply-To
<20210228195414.21372-1-avarab@gmail.com>

As noted in 1. this set of trivial fixes has been split off from my "describe tests fixes. The two patches were needed for a now-ejected "make test_expect_{success,failure} return 1" (to catch such "set -e" issues).

Even with that gone for now and thus the immediate incentive for these fixes being gone, it makes sense to fix these tests to use a more modern style.

The only other change since v1 is using ">" instead of "touch" per Eric Wong's suggestion, and rewording the commit message(s) to not promise a follow-up change to test_expect_{success,failure}.

Ævar Arnfjörð Bjarmason (2):
  svn tests: remove legacy re-setup from init-clone test
  svn tests: refactor away a "set -e" in test body
 t/t9117-git-svn-init-clone.sh |  6 ------
 t/t9148-git-svn-propset.sh    | 27 +++++++++++++++------------
 2 files changed, 15 insertions(+), 18 deletions(-)
Range-diff against v1:
1:  be5ed59dc61 = 1:  d08e098ea8d svn tests: remove legacy re-setup from init-clone test
2:  0b4238d012a ! 2:  8dd13c24994 svn tests: refactor away a "set -e" in test body
    @@ Commit message
         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. This
    -    would have broken in combination with a subsequent change to make
    -    "test_expect_success" return 1 to catch such cases.
    +    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 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".
    +    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>
     
    @@ t/t9148-git-svn-propset.sh: test_description='git svn propset tests'
     +	(
     +		cd import &&
     +		# for "add props top level"
    -+		touch foo &&
    ++		>foo &&
     +		# for "add props relative"
    -+		touch subdir/foo_subdir &&
    ++		>subdir/foo_subdir &&
     +		# for "add props subdir"
    -+		touch "$foo_subdir2" &&
    ++		>"$foo_subdir2" &&
     +		svn_cmd import -m "import for git svn" . "$svnrepo"
     +	)
     +'
3:  4f2c4f1fdd5 < -:  ----------- test-lib: return 1 from test_expect_{success,failure}
-- 
2.31.1.634.gb41287a30b0
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 14 of 34 in “describe: dont abort too early when searching tags”
  1. describe: dont abort too early when searching tagsBenno Evers, Feb 23, 2020
  2. Junio C HamanoFeb 24, 2020
  3. benno@bmevers.deFeb 25, 2020
  4. Junio C HamanoFeb 25, 2020
  5. 00/10 describe tests: refactor & fix recent broken testsÆvar Arnfjörð Bjarmason, Feb 28, 2021
  6. Junio C HamanoMar 9, 2021
  7. Junio C HamanoMar 12, 2021
  8. 0/5 describe test fixesÆvar Arnfjörð Bjarmason, Apr 12, 2021
  9. 1/5 describe tests: improve test for --work-tree & --dirtyÆvar Arnfjörð Bjarmason, Apr 12, 2021
  10. 3/5 describe tests: don't rely on err.actual from "check_describe"Ævar Arnfjörð Bjarmason, Apr 12, 2021
  11. 2/5 describe tests: refactor away from glob matchingÆvar Arnfjörð Bjarmason, Apr 12, 2021
  12. 4/5 describe tests: fix nested "test_expect_success" callÆvar Arnfjörð Bjarmason, Apr 12, 2021
  13. 5/5 describe tests: support -C in "check_describe"Ævar Arnfjörð Bjarmason, Apr 12, 2021
  14. 0/2 svn tests: trivial "set -e" in main body of test fixesÆvar Arnfjörð Bjarmason, Apr 12, 2021
  15. 1/2 svn tests: remove legacy re-setup from init-clone testÆvar Arnfjörð Bjarmason, Apr 12, 2021
  16. 2/2 svn tests: refactor away a "set -e" in test bodyÆvar Arnfjörð Bjarmason, Apr 12, 2021
  17. 01/10 describe tests: improve test for --work-tree & --dirtyÆvar Arnfjörð Bjarmason, Feb 28, 2021
  18. 02/10 describe tests: refactor away from glob matchingÆvar Arnfjörð Bjarmason, Feb 28, 2021
  19. Junio C HamanoMar 1, 2021
  20. 04/10 test-lib functions: add an --annotated-tag option to "test_commit"Ævar Arnfjörð Bjarmason, Feb 28, 2021
  21. Junio C HamanoMar 1, 2021
  22. Ævar Arnfjörð BjarmasonMar 2, 2021
  23. Junio C HamanoMar 3, 2021
  24. 03/10 describe tests: always assert empty stderr from "describe"Ævar Arnfjörð Bjarmason, Feb 28, 2021
  25. Junio C HamanoMar 1, 2021
  26. 05/10 describe tests: convert setup to use test_commitÆvar Arnfjörð Bjarmason, Feb 28, 2021
  27. Junio C HamanoMar 1, 2021
  28. 06/10 describe tests: fix nested "test_expect_success" callÆvar Arnfjörð Bjarmason, Feb 28, 2021
  29. 08/10 svn tests: remove legacy re-setup from init-clone testÆvar Arnfjörð Bjarmason, Feb 28, 2021
  30. 07/10 describe tests: support -C in "check_describe"Ævar Arnfjörð Bjarmason, Feb 28, 2021
  31. 09/10 svn tests: refactor away a "set -e" in test bodyÆvar Arnfjörð Bjarmason, Feb 28, 2021
  32. Eric WongFeb 28, 2021
  33. 10/10 test-lib: return 1 from test_expect_{success,failure}Ævar Arnfjörð Bjarmason, Feb 28, 2021
  34. Junio C HamanoMar 1, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.