Re: [PATCH tg/add-chmod+x-fix 1/2] t3700-add: create subdirectory gently

From: Thomas Gummerer <t.gummerer@gmail.com>
Date: Sep 20, 2016, 19:28 UTC
Message-ID: <20160920192828.GF8254@hank>
In-Reply-To: <cee3c784-8f03-c524-2f67-d35cb3755a41@kdbg.org>

Hi Johannes,

On 09/20, Johannes Sixt wrote:

Show 6 quoted lines

> The subdirectory 'sub' is created early in the test file. Later, a test
> case removes it during its clean-up actions. However, this test case is
> protected by POSIXPERM. Consequently, 'sub' remains when the POSIXPERM
> prerequisite is not satisfied. Later, a recently introduced test case
> creates 'sub' again. Use -p with mkdir so that it does not fail if 'sub'
> already exists.

Thanks for catching and fixing this. Having a look at the tests shows that this happens through a git reset --hard at the start of the tests that require POSIXPERM, which makes me wonder whether we should do such a cleanup somewhere unconditionally, or move the tests that do require POSIXPERM to the end of the test file to possibly prevent similar breakages in the future?

Show 21 quoted lines

> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
>  t/t3700-add.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/t/t3700-add.sh b/t/t3700-add.sh
> index 0a962a6..16ab2da 100755
> --- a/t/t3700-add.sh
> +++ b/t/t3700-add.sh
> @@ -380,7 +380,7 @@ test_expect_success 'no file status change if no pathspec is given' '
>  '
>  
>  test_expect_success 'no file status change if no pathspec is given in subdir' '
> -	mkdir sub &&
> +	mkdir -p sub &&
>  	(
>  		cd sub &&
>  		>sub-foo1 &&
> -- 
> 2.10.0.85.gea34e30
>

-- 
Thomas