threads / patch / 30332

patchgit p4: fix unit tests

Subject: [PATCH] git p4: fix unit tests

## tl;dr

3 messages between Apr 25, 2012 and Apr 25, 2012. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Luke Diamand· Apr 25, 2012, 08:16 UTC · lore

[PATCHv1] git p4: fix for submit/edit unit test

My P4EDITOR changes broke the submit/edit "git p4" unit test. This fixes it.

Junio - would you prefer me to resubmit the entire series?

Thanks Luke

Luke Diamand (1):
  git p4: fix unit tests

 t/t9805-git-p4-skip-submit-edit.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.7.10.473.g0796

Luke Diamand· Apr 25, 2012, 08:16 UTC · re: Luke Diamand · lore

The submit-edit tests relied on P4EDITOR being unset. Set it explicitly to an empty string.

Signed-off-by: Luke Diamand <luke@diamand.org>
---
 t/t9805-git-p4-skip-submit-edit.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/t9805-git-p4-skip-submit-edit.sh +1 −1

diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
index 4a72f79..353dcfb 100755
--- a/t/t9805-git-p4-skip-submit-edit.sh
+++ b/t/t9805-git-p4-skip-submit-edit.sh
@@ -91,7 +91,7 @@ test_expect_success 'no config, edited' '
 		cd "$git" &&
 		echo line >>file1 &&
 		git commit -a -m "change 5" &&
-		EDITOR="\"$ed\"" git p4 submit &&
+		P4EDITOR="" EDITOR="\"$ed\"" git p4 submit &&
 		p4 changes //depot/... >wc &&
 		test_line_count = 5 wc
 	)

-- 
1.7.10.473.g0796

Junio C Hamano· Apr 25, 2012, 15:18 UTC · re: Luke Diamand · lore

Re: [PATCHv1] git p4: fix for submit/edit unit test

Luke Diamand <luke@diamand.org> writes:

> My P4EDITOR changes broke the submit/edit "git p4" unit test.
> This fixes it.
>
> Junio - would you prefer me to resubmit the entire series?

It is too late for replacement, as the series is in 'next'. Incremental updates like you did is good.

Thanks.