Re: [PATCH 01/15] t7411: check configuration parsing errors

2017-07-26 Thread Junio C Hamano
Brandon Williams  writes:

> Check for configuration parsing errors in '.gitmodules' in t7411, which
> is explicitly testing the submodule-config subsystem, instead of in
> t7400.  Also explicitly use the test helper instead of relying on the
> gitmodules file from being read in status.

Makes sense.

> ...
> - test_must_fail git status
> -'
> -...
> +test_expect_success 'configuration parsing with error' '
> + test_when_finished "rm -rf repo" &&
> + test_create_repo repo &&
> + cat >repo/.gitmodules <<-\EOF &&
> + [submodule "s"]
> + path
> + ignore
> + EOF
> + (
> + cd repo &&
> + test_must_fail test-submodule-config "" s 2>actual &&
> + test_i18ngrep "bad config" actual
> + )
> +'
> +
>  cat >super/expect <  Submodule name: 'a' for path 'a'
>  Submodule name: 'a' for path 'b'


[PATCH 01/15] t7411: check configuration parsing errors

2017-07-25 Thread Brandon Williams
Check for configuration parsing errors in '.gitmodules' in t7411, which
is explicitly testing the submodule-config subsystem, instead of in
t7400.  Also explicitly use the test helper instead of relying on the
gitmodules file from being read in status.

Signed-off-by: Brandon Williams 
---
 t/t7400-submodule-basic.sh  | 10 --
 t/t7411-submodule-config.sh | 15 +++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index dcac364c5..717447526 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -46,16 +46,6 @@ test_expect_success 'submodule update aborts on missing 
gitmodules url' '
test_must_fail git submodule init
 '
 
-test_expect_success 'configuration parsing' '
-   test_when_finished "rm -f .gitmodules" &&
-   cat >.gitmodules <<-\EOF &&
-   [submodule "s"]
-   path
-   ignore
-   EOF
-   test_must_fail git status
-'
-
 test_expect_success 'setup - repository in init subdirectory' '
mkdir init &&
(
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index eea36f1db..7d6b25ba2 100755
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -31,6 +31,21 @@ test_expect_success 'submodule config cache setup' '
)
 '
 
+test_expect_success 'configuration parsing with error' '
+   test_when_finished "rm -rf repo" &&
+   test_create_repo repo &&
+   cat >repo/.gitmodules <<-\EOF &&
+   [submodule "s"]
+   path
+   ignore
+   EOF
+   (
+   cd repo &&
+   test_must_fail test-submodule-config "" s 2>actual &&
+   test_i18ngrep "bad config" actual
+   )
+'
+
 cat >super/expect <