Re: [PATCH v2 3/3] t9903: add extra tests for bash.showDirtyState

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 13, 2013, 16:28 UTC
Message-ID: <7vy5es9o0g.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1360753321-5002-3-git-send-email-martinerikwerner@gmail.com>

Martin Erik Werner <martinerikwerner@gmail.com> writes:

> Added 3 extra tests for the bash.showDirtyState config option, tests
> should now cover all combinations of the shell var being set/unset and
> the config option being enabled/disabled, given a dirty file.

Strictly speaking, you have 6 not 4 combinations (shell variable set/unset * config missing/set to false/set to true). I think these additional tests cover should all 6 because "config missing" case should already have had tests before bash.showDirtyState was added.

> * Renamed test 'disabled by config' to 'shell variable set with config
>   disabled' for consistency
> ---

Sign-off?

Show 57 quoted lines

>  t/t9903-bash-prompt.sh |   38 +++++++++++++++++++++++++++++++++++++-
>  1 file changed, 37 insertions(+), 1 deletion(-)
>
> diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
> index cb008e2..fa81b09 100755
> --- a/t/t9903-bash-prompt.sh
> +++ b/t/t9903-bash-prompt.sh
> @@ -360,12 +360,48 @@ test_expect_success 'prompt - dirty status indicator - before root commit' '
>  	test_cmp expected "$actual"
>  '
>  
> -test_expect_success 'prompt - dirty status indicator - disabled by config' '
> +test_expect_success 'prompt - dirty status indicator - shell variable unset with config disabled' '
>  	printf " (master)" > expected &&
>  	echo "dirty" > file &&
>  	test_when_finished "git reset --hard" &&
>  	test_config bash.showDirtyState false &&
>  	(
> +		unset -v GIT_PS1_SHOWDIRTYSTATE &&
> +		__git_ps1 > "$actual"
> +	) &&
> +	test_cmp expected "$actual"
> +'
> +
> +test_expect_success 'prompt - dirty status indicator - shell variable unset with config enabled' '
> +	printf " (master)" > expected &&
> +	echo "dirty" > file &&
> +	test_when_finished "git reset --hard" &&
> +	test_config bash.showDirtyState true &&
> +	(
> +		unset -v GIT_PS1_SHOWDIRTYSTATE &&
> +		__git_ps1 > "$actual"
> +	) &&
> +	test_cmp expected "$actual"
> +'
> +
> +test_expect_success 'prompt - dirty status indicator - shell variable set with config disabled' '
> +	printf " (master)" > expected &&
> +	echo "dirty" > file &&
> +	test_when_finished "git reset --hard" &&
> +	test_config bash.showDirtyState false &&
> +	(
> +		GIT_PS1_SHOWDIRTYSTATE=y &&
> +		__git_ps1 > "$actual"
> +	) &&
> +	test_cmp expected "$actual"
> +'
> +
> +test_expect_success 'prompt - dirty status indicator - shell variable set with config enabled' '
> +	printf " (master *)" > expected &&
> +	echo "dirty" > file &&
> +	test_when_finished "git reset --hard" &&
> +	test_config bash.showDirtyState true &&
> +	(
>  		GIT_PS1_SHOWDIRTYSTATE=y &&
>  		__git_ps1 > "$actual"
>  	) &&