threads / patch / 48487

patcht7005-editor: get rid of the SPACES_IN_FILENAMES prereq

Subject: [PATCH] t7005-editor: get rid of the SPACES_IN_FILENAMES prereq

## tl;dr

3 messages between May 14, 2018 and May 18, 2018. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

SZEDER Gábor· May 14, 2018, 10:28 UTC · lore

The last two tests 'editor with a space' and 'core.editor with a space' in 't7005-editor.sh' need the SPACES_IN_FILENAMES prereq to ensure that they are only run on filesystems that allow, well, spaces in filesnames. However, we have been putting a space in the name of the trash directory for just over a decade now, so we wouldn't be able to run any of our tests on such a filesystem in the first place.

This prereq is therefore unnecessary, remove it.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
---
 t/t7005-editor.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

Show changes to t/t7005-editor.sh +3 −9

diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 29e5043b94..b2ca77b338 100755
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -111,14 +111,8 @@ do
 	'
 done
 
-if echo 'echo space > "$1"' > "e space.sh"
-then
-	# FS supports spaces in filenames
-	test_set_prereq SPACES_IN_FILENAMES
-fi
-
-test_expect_success SPACES_IN_FILENAMES 'editor with a space' '
-
+test_expect_success 'editor with a space' '
+	echo "echo space >\$1" >"e space.sh" &&
 	chmod a+x "e space.sh" &&
 	GIT_EDITOR="./e\ space.sh" git commit --amend &&
 	test space = "$(git show -s --pretty=format:%s)"
@@ -126,7 +120,7 @@ test_expect_success SPACES_IN_FILENAMES 'editor with a space' '
 '
 
 unset GIT_EDITOR
-test_expect_success SPACES_IN_FILENAMES 'core.editor with a space' '
+test_expect_success 'core.editor with a space' '
 
 	git config core.editor \"./e\ space.sh\" &&
 	git commit --amend &&

-- 
2.17.0.756.gcf614c5aff

Eric Sunshine· May 14, 2018, 17:41 UTC · re: SZEDER Gábor · lore

Re: [PATCH] t7005-editor: get rid of the SPACES_IN_FILENAMES prereq

On Mon, May 14, 2018 at 6:28 AM, SZEDER Gábor <szeder.dev@gmail.com> wrote:

> The last two tests 'editor with a space' and 'core.editor with a
> space' in 't7005-editor.sh' need the SPACES_IN_FILENAMES prereq to
> ensure that they are only run on filesystems that allow, well, spaces
> in filesnames.  However, we have been putting a space in the name of

s filesnames/filenames/

Show 6 quoted lines

> the trash directory for just over a decade now, so we wouldn't be able
> to run any of our tests on such a filesystem in the first place.
>
> This prereq is therefore unnecessary, remove it.
>
> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>

Jeff King· May 18, 2018, 21:39 UTC · re: SZEDER Gábor · lore

Re: [PATCH] t7005-editor: get rid of the SPACES_IN_FILENAMES prereq

On Mon, May 14, 2018 at 12:28:12PM +0200, SZEDER Gábor wrote:

Show 8 quoted lines

> The last two tests 'editor with a space' and 'core.editor with a
> space' in 't7005-editor.sh' need the SPACES_IN_FILENAMES prereq to
> ensure that they are only run on filesystems that allow, well, spaces
> in filesnames.  However, we have been putting a space in the name of
> the trash directory for just over a decade now, so we wouldn't be able
> to run any of our tests on such a filesystem in the first place.
> 
> This prereq is therefore unnecessary, remove it.

I wondered if there might be some platforms that tweak the test environment in such a way that we skip the space in "trash directory". But looking at test-lib.sh, I don't think there is any easy way to do so (e.g., you can't just set $TEST_DIRECTORY_NAME or something). So this does seem safe, and it's nice to reduce unnecessary complexity.

-Peff