threads / patch / 34483

patchgit p4 test: Check ignore files with client spec

Subject: [PATCH] git p4 test: Check ignore files with client spec

## tl;dr

3 messages between Jul 18, 2013 and Jul 20, 2013. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Vitor Antunes· Jul 18, 2013, 23:04 UTC · lore

This test confirms that a file can be ignored during git p4 sync if if is excluded in P4 client specification.

Signed-off-by: Vitor Antunes <vitor.hda@gmail.com>
---
 t/t9801-git-p4-branch.sh | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

Show changes to t/t9801-git-p4-branch.sh +20 −3

diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 9730821..2bf142d 100755
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -469,9 +469,11 @@ test_expect_success 'use-client-spec detect-branches skips branches setup' '
 		View: //depot/usecs/b1/... //depot/usecs/b3/...
 		EOF
 
-		echo b3/b3-file3 >b3/b3-file3 &&
-		p4 add b3/b3-file3 &&
-		p4 submit -d "b3/b3-file3"
+		echo b3/b3-file3_1 >b3/b3-file3_1 &&
+		echo b3/b3-file3_2 >b3/b3-file3_2 &&
+		p4 add b3/b3-file3_1 &&
+		p4 add b3/b3-file3_2 &&
+		p4 submit -d "b3/b3-file3_1 b3/b3-file3_2"
 	)
 '
 
@@ -487,6 +489,21 @@ test_expect_success 'use-client-spec detect-branches skips branches' '
 	)
 '
 
+test_expect_success 'use-client-spec detect-branches skips files in branches' '
+	client_view "//depot/usecs/... //client/..." \
+		    "-//depot/usecs/b3/b3-file3_1 //client/b3/b3-file3_1" &&
+	test_when_finished cleanup_git &&
+	test_create_repo "$git" &&
+	(
+		cd "$git" &&
+		git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
+		git checkout -b master p4/usecs/b3 &&
+		test_path_is_file b1-file1 &&
+		test_path_is_file b3-file3_2 &&
+		test_path_is_missing b3-file3_1
+	)
+'
+
 test_expect_success 'kill p4d' '
 	kill_p4d
 '

-- 
1.8.3.2

Pete Wyckoff· Jul 20, 2013, 13:48 UTC · re: Vitor Antunes · lore

Re: [PATCH] git p4 test: Check ignore files with client spec

vitor.hda@gmail.com wrote on Fri, 19 Jul 2013 00:04 +0100:

> This test confirms that a file can be ignored during git p4 sync if if is
> excluded in P4 client specification.

This is a good check to have, and I'm glad it happens to work.  :)

I'd forgotten during your conversation with Matthieu that we did indeed have tests for detect-branches with use-client-spec. This test sure seems like it should cover that situation though.

Acked-by: Pete Wyckoff <pw@padd.com>

Show 53 quoted lines

> ---
>  t/t9801-git-p4-branch.sh | 23 ++++++++++++++++++++---
>  1 file changed, 20 insertions(+), 3 deletions(-)
> 
> diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
> index 9730821..2bf142d 100755
> --- a/t/t9801-git-p4-branch.sh
> +++ b/t/t9801-git-p4-branch.sh
> @@ -469,9 +469,11 @@ test_expect_success 'use-client-spec detect-branches skips branches setup' '
>  		View: //depot/usecs/b1/... //depot/usecs/b3/...
>  		EOF
>  
> -		echo b3/b3-file3 >b3/b3-file3 &&
> -		p4 add b3/b3-file3 &&
> -		p4 submit -d "b3/b3-file3"
> +		echo b3/b3-file3_1 >b3/b3-file3_1 &&
> +		echo b3/b3-file3_2 >b3/b3-file3_2 &&
> +		p4 add b3/b3-file3_1 &&
> +		p4 add b3/b3-file3_2 &&
> +		p4 submit -d "b3/b3-file3_1 b3/b3-file3_2"
>  	)
>  '
>  
> @@ -487,6 +489,21 @@ test_expect_success 'use-client-spec detect-branches skips branches' '
>  	)
>  '
>  
> +test_expect_success 'use-client-spec detect-branches skips files in branches' '
> +	client_view "//depot/usecs/... //client/..." \
> +		    "-//depot/usecs/b3/b3-file3_1 //client/b3/b3-file3_1" &&
> +	test_when_finished cleanup_git &&
> +	test_create_repo "$git" &&
> +	(
> +		cd "$git" &&
> +		git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
> +		git checkout -b master p4/usecs/b3 &&
> +		test_path_is_file b1-file1 &&
> +		test_path_is_file b3-file3_2 &&
> +		test_path_is_missing b3-file3_1
> +	)
> +'
> +
>  test_expect_success 'kill p4d' '
>  	kill_p4d
>  '
> -- 
> 1.8.3.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Vitor Antunes· Jul 20, 2013, 14:59 UTC · re: Pete Wyckoff · lore

Re: [PATCH] git p4 test: Check ignore files with client spec

On Sat, Jul 20, 2013 at 2:48 PM, Pete Wyckoff <pw@padd.com> wrote:

> I'd forgotten during your conversation with Matthieu that we
> did indeed have tests for detect-branches with use-client-spec.
> This test sure seems like it should cover that situation though.

It was good that you had some tests implemented, otherwise it would have taken me much more time to implement this ;)