From: Eric Sunshine <sunshine@sunshineco.com>
Date: Fri, 03 Apr 2015 20:00:23 GMT
Subject: Re: [PATCHv2 4/4] git-p4: update locked test case
Message-ID: <CAPig+cSsPZZ=kEQ9jwj-BKkO+gKFwZYVi-FrTvvTZpmatmokAQ@mail.gmail.com>
In-Reply-To: <1428087218-8186-5-git-send-email-luke@diamand.org>

On Fri, Apr 3, 2015 at 2:53 PM, Luke Diamand <luke@diamand.org> wrote:
> The add-new-file and copy-existing-file tests from
> t9816-git-p4-locked.sh now pass. Update the test
> case accordingly.

This patch should be folded into patch 3/4, shouldn't it?

> Signed-off-by: Luke Diamand <luke@diamand.org>
> ---
>  t/t9816-git-p4-locked.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh
> index 464f10b..d048bd3 100755
> --- a/t/t9816-git-p4-locked.sh
> +++ b/t/t9816-git-p4-locked.sh
> @@ -35,7 +35,7 @@ test_expect_success 'edit with lock not taken' '
>         )
>  '
>
> -test_expect_failure 'add with lock not taken' '
> +test_expect_success 'add with lock not taken' '
>         test_when_finished cleanup_git &&
>         git p4 clone --dest="$git" //depot &&
>         (
> @@ -107,7 +107,7 @@ test_expect_failure 'chmod with lock taken' '
>         )
>  '
>
> -test_expect_failure 'copy with lock taken' '
> +test_expect_success 'copy with lock taken' '
>         lock_in_another_client &&
>         test_when_finished cleanup_git &&
>         test_when_finished "cd \"$cli\" && p4 revert file2 && rm -f file2" &&
> --
> 2.3.0.rc1.30.g76afe74