[v2,02/18] t7526: add tests for error conditions

Commit Message

John Cai via GitGitGadget Dec. 16, 2019, 3:47 p.m. UTC

From: Alexandr Miloslavskiy <[e-mail]>

Suggested-By: Phillip Wood <[e-mail]>
Signed-off-by: Alexandr Miloslavskiy <[e-mail]>
---
 t/t7526-commit-pathspec-file.sh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

Comments

Junio C Hamano Dec. 18, 2019, 10:02 p.m. UTC | #1

"Alexandr Miloslavskiy via GitGitGadget" <[e-mail]>
writes:

> +	test_must_fail git commit --pathspec-from-file=- --interactive -m "Commit" <list 2>err &&
> +	test_i18ngrep "\-\-pathspec-from-file is incompatible with \-\-interactive/\-\-patc
h" err &&

What's with the overly-noisy quoting of dashes here?  To match a
string that happens to begin with a dash, either one of

	$ grep -e "-this string begins with and has-many-dashes-in-it" file
	$ grep "[-]this string begins with and has-many-dashes-in-it" file

would be sufficient and more idiomatic.

Or am I missing some other reason why the test is written this way?

> +	test_must_fail git commit --pathspec-from-file=- --patch -m "Commit" <list 2>err &&
> +	test_i18ngrep "\-\-pathspec-from-file is incompatible with \-\-interactive/\-\-patch" err &&
> +
> +	test_must_fail git commit --pathspec-from-file=- -m "Commit" -- fileA.t <list 2>err &&
> +	test_i18ngrep "\-\-pathspec-from-file is incompatible with pathspec arguments" err &&
> +
> +	test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
> +	test_i18ngrep "\-\-pathspec-file-nul requires \-\-pathspec-from-file" err &&
> +
> +	test_must_fail git commit --pathspec-from-file=- --include -m "Commit" <empty_list 2>err &&
> +	test_i18ngrep "No paths with \-\-include/\-\-only does not make sense." err &&
> +
> +	test_must_fail git commit --pathspec-from-file=- --only -m "Commit" <empty_list 2>err &&
> +	test_i18ngrep "No paths with \-\-include/\-\-only does not make sense." err
> +'
> +
>  test_done

Alexandr Miloslavskiy Dec. 19, 2019, 6:03 p.m. UTC | #2

On 18.12.2019 23:02, Junio C Hamano wrote:

>> +	test_must_fail git commit --pathspec-from-file=- --interactive -m "Commit" <list 2>err &&
>> +	test_i18ngrep "\-\-pathspec-from-file is incompatible with \-\-interactive/\-\-patc
> h" err &&
> 
> What's with the overly-noisy quoting of dashes here?  To match a
> string that happens to begin with a dash, either one of
> 
> 	$ grep -e "-this string begins with and has-many-dashes-in-it" file
> 	$ grep "[-]this string begins with and has-many-dashes-in-it" file
> 
> would be sufficient and more idiomatic.
> 
> Or am I missing some other reason why the test is written this way?

No, it's just my lack of experience. Thanks for your fix! I have applied 
it in V3.

Patch

diff --git a/t/t7526-commit-pathspec-file.sh b/t/t7526-commit-pathspec-file.sh
index 4e592f7472..68920e8ff9 100755
--- a/t/t7526-commit-pathspec-file.sh
+++ b/t/t7526-commit-pathspec-file.sh
@@ -61,4 +61,28 @@  test_expect_success 'only touches what was listed' '
 	verify_expect
 '
 
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
+
+	test_must_fail git commit --pathspec-from-file=- --interactive -m "Commit" <list 2>err &&
+	test_i18ngrep "\-\-pathspec-from-file is incompatible with \-\-interactive/\-\-patch" err &&
+
+	test_must_fail git commit --pathspec-from-file=- --patch -m "Commit" <list 2>err &&
+	test_i18ngrep "\-\-pathspec-from-file is incompatible with \-\-interactive/\-\-patch" err &&
+
+	test_must_fail git commit --pathspec-from-file=- -m "Commit" -- fileA.t <list 2>err &&
+	test_i18ngrep "\-\-pathspec-from-file is incompatible with pathspec arguments" err &&
+
+	test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
+	test_i18ngrep "\-\-pathspec-file-nul requires \-\-pathspec-from-file" err &&
+
+	test_must_fail git commit --pathspec-from-file=- --include -m "Commit" <empty_list 2>err &&
+	test_i18ngrep "No paths with \-\-include/\-\-only does not make sense." err &&
+
+	test_must_fail git commit --pathspec-from-file=- --only -m "Commit" <empty_list 2>err &&
+	test_i18ngrep "No paths with \-\-include/\-\-only does not make sense." err
+'
+
 test_done