threads / patch / 21900

patch, 2 partsAdd a few more status tests

Subject: [PATCH 0/2] Add a few more status tests

## tl;dr

9 messages between Dec 8, 2009 and Dec 9, 2009. Diffs are folded; open one to read it.

replies: 8people: 3as markdown or json

Michael J Gruber· Dec 8, 2009, 10:12 UTC · lore

Here are a few more tests for git status. The first one makes sure that --porcelain uses paths based on the root, it makes sense on top of 14ed05d (t7508-status.sh: Add tests for status -s, 2009-11-27) or later.

The second one checks long, short and porcelain with color. It makes sense on top of 3fe2a89 (status -s: obey color.status, 2009-12-05), although one test will fail without the later 8661768 (status: reduce duplicated setup code, 2009-12-07) and predecessor.

Remarks:
- There's not a single merge related status test so far.
- There's no test with -z because I don't know what it's suppoded to
  (besides the obvious thing): should it turn off color automatically
  but not relativePaths? Or should it switch to --porcelain -z?

Depending on the answer to the latter I have to do one more fixup to wt-status.c (and write another test).

Thanks: to J6t for pointing me to decrypt_color()

Michael J Gruber (2):
  t7508-status: status --porcelain ignores relative paths setting
  t7508-status: test all modes with color
 t/t7508-status.sh |  137 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 137 insertions(+), 0 deletions(-)
Michael J Gruber· Dec 8, 2009, 10:12 UTC · re: Michael J Gruber · lore

[PATCH 1/2] t7508-status: status --porcelain ignores relative paths setting

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 t/t7508-status.sh |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
Show changes to t/t7508-status.sh +18 −0
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 99a74bd..8e7727e 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -298,6 +298,24 @@ test_expect_success 'status -s with relative paths' '
 '
 
 cat > expect << \EOF
+ M dir1/modified
+A  dir2/added
+?? dir1/untracked
+?? dir2/modified
+?? dir2/untracked
+?? expect
+?? output
+?? untracked
+EOF
+
+test_expect_success 'status --porcelain ignores relative paths setting' '
+
+	(cd dir1 && git status --porcelain) > output &&
+	test_cmp expect output
+
+'
+
+cat > expect << \EOF
 # On branch master
 # Changes to be committed:
 #   (use "git reset HEAD <file>..." to unstage)

-- 
1.6.6.rc1.292.gd8fe
Michael J Gruber· Dec 8, 2009, 10:12 UTC · re: Michael J Gruber · lore

[PATCH 2/2] t7508-status: test all modes with color

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 t/t7508-status.sh |  119 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 119 insertions(+), 0 deletions(-)
Show changes to t/t7508-status.sh +119 −0
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 8e7727e..50554a0 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -31,6 +31,15 @@ test_expect_success 'setup' '
 	git add dir2/added
 '
 
+decrypt_color () {
+	sed \
+		-e 's/.\[1m/<WHITE>/g' \
+		-e 's/.\[31m/<RED>/g' \
+		-e 's/.\[32m/<GREEN>/g' \
+		-e 's/.\[34m/<BLUE>/g' \
+		-e 's/.\[m/<RESET>/g'
+}
+
 test_expect_success 'status (1)' '
 
 	grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
@@ -315,6 +324,115 @@ test_expect_success 'status --porcelain ignores relative paths setting' '
 
 '
 
+test_expect_success 'setup unique colors' '
+
+	git config status.color.untracked blue
+
+'
+
+cat > expect << \EOF
+# On branch master
+# Changes to be committed:
+#   (use "git reset HEAD <file>..." to unstage)
+#
+#	<GREEN>new file:   dir2/added<RESET>
+#
+# Changed but not updated:
+#   (use "git add <file>..." to update what will be committed)
+#   (use "git checkout -- <file>..." to discard changes in working directory)
+#
+#	<RED>modified:   dir1/modified<RESET>
+#
+# Untracked files:
+#   (use "git add <file>..." to include in what will be committed)
+#
+#	<BLUE>dir1/untracked<RESET>
+#	<BLUE>dir2/modified<RESET>
+#	<BLUE>dir2/untracked<RESET>
+#	<BLUE>expect<RESET>
+#	<BLUE>output<RESET>
+#	<BLUE>untracked<RESET>
+EOF
+
+test_expect_success 'status with color.ui' '
+
+	git config color.ui always &&
+	git status | decrypt_color > output &&
+	test_cmp expect output
+
+'
+
+test_expect_success 'status with color.status' '
+
+	git config --unset color.ui &&
+	git config color.status always &&
+	git status | decrypt_color > output &&
+	test_cmp expect output
+
+'
+
+cat > expect << \EOF
+ <RED>M<RESET> dir1/modified
+<GREEN>A<RESET>  dir2/added
+<BLUE>??<RESET> dir1/untracked
+<BLUE>??<RESET> dir2/modified
+<BLUE>??<RESET> dir2/untracked
+<BLUE>??<RESET> expect
+<BLUE>??<RESET> output
+<BLUE>??<RESET> untracked
+EOF
+
+test_expect_success 'status -s with color.ui' '
+
+	git config --unset color.status &&
+	git config color.ui always &&
+	git status -s | decrypt_color > output &&
+	test_cmp expect output
+
+'
+
+test_expect_success 'status -s with color.status' '
+
+	git config --unset color.ui &&
+	git config color.status always &&
+	git status -s | decrypt_color > output &&
+	test_cmp expect output
+
+'
+
+cat > expect << \EOF
+ M dir1/modified
+A  dir2/added
+?? dir1/untracked
+?? dir2/modified
+?? dir2/untracked
+?? expect
+?? output
+?? untracked
+EOF
+
+test_expect_success 'status --porcelain ignores color.ui' '
+
+	git config --unset color.status &&
+	git config color.ui always &&
+	git status --porcelain | decrypt_color > output &&
+	test_cmp expect output
+
+'
+
+test_expect_success 'status --porcelain ignores color.status' '
+
+	git config --unset color.ui &&
+	git config color.status always &&
+	git status --porcelain | decrypt_color > output &&
+	test_cmp expect output
+
+'
+
+# recover unconditionally from color tests
+git config --unset color.status
+git config --unset color.ui
+
 cat > expect << \EOF
 # On branch master
 # Changes to be committed:
@@ -339,6 +457,7 @@ cat > expect << \EOF
 #	untracked
 EOF
 
+
 test_expect_success 'status without relative paths' '
 
 	git config status.relativePaths false

-- 
1.6.6.rc1.292.gd8fe
Jakub Narebski· Dec 8, 2009, 11:10 UTC · re: Michael J Gruber · lore

Re: [PATCH 2/2] t7508-status: test all modes with color

Michael J Gruber wrote:
Show 8 quoted lines
> +decrypt_color () {
> +       sed \
> +               -e 's/.\[1m/<WHITE>/g' \
> +               -e 's/.\[31m/<RED>/g' \
> +               -e 's/.\[32m/<GREEN>/g' \
> +               -e 's/.\[34m/<BLUE>/g' \
> +               -e 's/.\[m/<RESET>/g'
> +}

Shouldn't this be better in test-lib.sh, or some common lib (lib-color.sh or color-lib.sh; we are unfortunately a bit inconsistent in naming here)?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Michael J Gruber· Dec 8, 2009, 16:06 UTC · re: Jakub Narebski · lore

Re: [PATCH 2/2] t7508-status: test all modes with color

Jakub Narebski venit, vidit, dixit 08.12.2009 12:10:
Show 14 quoted lines
> Michael J Gruber wrote:
> 
>> +decrypt_color () {
>> +       sed \
>> +               -e 's/.\[1m/<WHITE>/g' \
>> +               -e 's/.\[31m/<RED>/g' \
>> +               -e 's/.\[32m/<GREEN>/g' \
>> +               -e 's/.\[34m/<BLUE>/g' \
>> +               -e 's/.\[m/<RESET>/g'
>> +}
> 
> Shouldn't this be better in test-lib.sh, or some common lib 
> (lib-color.sh or color-lib.sh; we are unfortunately a bit inconsistent
> in naming here)?

Well, so far it's used in two places (and somewhat differently). I would say test-libification starts at 3 :)

Michael
Junio C Hamano· Dec 9, 2009, 05:32 UTC · re: Michael J Gruber · lore

Re: [PATCH 2/2] t7508-status: test all modes with color

Michael J Gruber <git@drmicha.warpmail.net> writes:
Show 18 quoted lines
> Jakub Narebski venit, vidit, dixit 08.12.2009 12:10:
>> Michael J Gruber wrote:
>> 
>>> +decrypt_color () {
>>> +       sed \
>>> +               -e 's/.\[1m/<WHITE>/g' \
>>> +               -e 's/.\[31m/<RED>/g' \
>>> +               -e 's/.\[32m/<GREEN>/g' \
>>> +               -e 's/.\[34m/<BLUE>/g' \
>>> +               -e 's/.\[m/<RESET>/g'
>>> +}
>> 
>> Shouldn't this be better in test-lib.sh, or some common lib 
>> (lib-color.sh or color-lib.sh; we are unfortunately a bit inconsistent
>> in naming here)?
>
> Well, so far it's used in two places (and somewhat differently). I would
> say test-libification starts at 3 :)
That is a pretty lame excuse and is a bad way to keep things maintainable.

Having two copies now means that you will *double* the chance for the next person to copy and paste one of the existing copies that are found in the non-library-ish part of the test script set to create the third duplicate, without even realizing that there already are two copies that should have been consolidated in the first place. The worst part is that once that duplication is pointed out, s/he will use the existing two copies as an excuse for copy and paste.

Please don't.
Junio C Hamano· Dec 9, 2009, 05:44 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/2] t7508-status: test all modes with color

Junio C Hamano <gitster@pobox.com> writes:
Show 22 quoted lines
> Michael J Gruber <git@drmicha.warpmail.net> writes:
>
>> Jakub Narebski venit, vidit, dixit 08.12.2009 12:10:
>>> Michael J Gruber wrote:
>>> 
>>>> +decrypt_color () {
>>>> +       sed \
>>>> +               -e 's/.\[1m/<WHITE>/g' \
>>>> +               -e 's/.\[31m/<RED>/g' \
>>>> +               -e 's/.\[32m/<GREEN>/g' \
>>>> +               -e 's/.\[34m/<BLUE>/g' \
>>>> +               -e 's/.\[m/<RESET>/g'
>>>> +}
>>> 
>>> Shouldn't this be better in test-lib.sh, or some common lib 
>>> (lib-color.sh or color-lib.sh; we are unfortunately a bit inconsistent
>>> in naming here)?
>>
>> Well, so far it's used in two places (and somewhat differently). I would
>> say test-libification starts at 3 :)
> ...
> Please don't.
I'll squash this in to fix it up.

I don't know where 36->BROWN mistake came from when color.h has a series of #define that can be used to make the decoding script mechanically, though ;-)

 t/t4034-diff-words.sh |   23 ++++---------
 t/t7508-status.sh     |   83 ++++++++++++++++++++++---------------------------
 t/test-lib.sh         |   11 ++++++
 3 files changed, 55 insertions(+), 62 deletions(-)
Show changes to 3 files +55 −62

t/t4034-diff-words.sh, t/t7508-status.sh, t/test-lib.sh

diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 4508eff..ea895b0 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -11,18 +11,9 @@ test_expect_success setup '
 
 '
 
-decrypt_color () {
-	sed \
-		-e 's/.\[1m/<WHITE>/g' \
-		-e 's/.\[31m/<RED>/g' \
-		-e 's/.\[32m/<GREEN>/g' \
-		-e 's/.\[36m/<BROWN>/g' \
-		-e 's/.\[m/<RESET>/g'
-}
-
 word_diff () {
 	test_must_fail git diff --no-index "$@" pre post > output &&
-	decrypt_color < output > output.decrypted &&
+	test_decode_color <output >output.decrypted &&
 	test_cmp expect output.decrypted
 }
 
@@ -47,7 +38,7 @@ cat > expect <<\EOF
 <WHITE>index 330b04f..5ed8eff 100644<RESET>
 <WHITE>--- a/pre<RESET>
 <WHITE>+++ b/post<RESET>
-<BROWN>@@ -1,3 +1,7 @@<RESET>
+<CYAN>@@ -1,3 +1,7 @@<RESET>
 <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
 <RESET>
 a = b + c<RESET>
@@ -68,7 +59,7 @@ cat > expect <<\EOF
 <WHITE>index 330b04f..5ed8eff 100644<RESET>
 <WHITE>--- a/pre<RESET>
 <WHITE>+++ b/post<RESET>
-<BROWN>@@ -1,3 +1,7 @@<RESET>
+<CYAN>@@ -1,3 +1,7 @@<RESET>
 h(4),<GREEN>hh<RESET>[44]
 <RESET>
 a = b + c<RESET>
@@ -104,7 +95,7 @@ cat > expect <<\EOF
 <WHITE>index 330b04f..5ed8eff 100644<RESET>
 <WHITE>--- a/pre<RESET>
 <WHITE>+++ b/post<RESET>
-<BROWN>@@ -1,3 +1,7 @@<RESET>
+<CYAN>@@ -1,3 +1,7 @@<RESET>
 h(4)<GREEN>,hh[44]<RESET>
 <RESET>
 a = b + c<RESET>
@@ -146,7 +137,7 @@ cat > expect <<\EOF
 <WHITE>index 330b04f..5ed8eff 100644<RESET>
 <WHITE>--- a/pre<RESET>
 <WHITE>+++ b/post<RESET>
-<BROWN>@@ -1,3 +1,7 @@<RESET>
+<CYAN>@@ -1,3 +1,7 @@<RESET>
 h(4),<GREEN>hh[44<RESET>]
 <RESET>
 a = b + c<RESET>
@@ -168,7 +159,7 @@ cat > expect <<\EOF
 <WHITE>index c29453b..be22f37 100644<RESET>
 <WHITE>--- a/pre<RESET>
 <WHITE>+++ b/post<RESET>
-<BROWN>@@ -1 +1 @@<RESET>
+<CYAN>@@ -1 +1 @@<RESET>
 aaa (aaa) <GREEN>aaa<RESET>
 EOF
 
@@ -187,7 +178,7 @@ cat > expect <<\EOF
 <WHITE>index 289cb9d..2d06f37 100644<RESET>
 <WHITE>--- a/pre<RESET>
 <WHITE>+++ b/post<RESET>
-<BROWN>@@ -1 +1 @@<RESET>
+<CYAN>@@ -1 +1 @@<RESET>
 (<RED>:<RESET>
 EOF
 
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 50554a0..cf67fe3 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -8,45 +8,36 @@ test_description='git status'
 . ./test-lib.sh
 
 test_expect_success 'setup' '
-	: > tracked &&
-	: > modified &&
+	: >tracked &&
+	: >modified &&
 	mkdir dir1 &&
-	: > dir1/tracked &&
-	: > dir1/modified &&
+	: >dir1/tracked &&
+	: >dir1/modified &&
 	mkdir dir2 &&
-	: > dir1/tracked &&
-	: > dir1/modified &&
+	: >dir1/tracked &&
+	: >dir1/modified &&
 	git add . &&
 
 	git status >output &&
 
 	test_tick &&
 	git commit -m initial &&
-	: > untracked &&
-	: > dir1/untracked &&
-	: > dir2/untracked &&
-	echo 1 > dir1/modified &&
-	echo 2 > dir2/modified &&
-	echo 3 > dir2/added &&
+	: >untracked &&
+	: >dir1/untracked &&
+	: >dir2/untracked &&
+	echo 1 >dir1/modified &&
+	echo 2 >dir2/modified &&
+	echo 3 >dir2/added &&
 	git add dir2/added
 '
 
-decrypt_color () {
-	sed \
-		-e 's/.\[1m/<WHITE>/g' \
-		-e 's/.\[31m/<RED>/g' \
-		-e 's/.\[32m/<GREEN>/g' \
-		-e 's/.\[34m/<BLUE>/g' \
-		-e 's/.\[m/<RESET>/g'
-}
-
 test_expect_success 'status (1)' '
 
 	grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
 
 '
 
-cat > expect << \EOF
+cat >expect <<\EOF
 # On branch master
 # Changes to be committed:
 #   (use "git reset HEAD <file>..." to unstage)
@@ -72,12 +63,12 @@ EOF
 
 test_expect_success 'status (2)' '
 
-	git status > output &&
+	git status >output &&
 	test_cmp expect output
 
 '
 
-cat > expect << \EOF
+cat >expect <<\EOF
  M dir1/modified
 A  dir2/added
 ?? dir1/untracked
@@ -90,7 +81,7 @@ EOF
 
 test_expect_success 'status -s (2)' '
 
-	git status -s > output &&
+	git status -s >output &&
 	test_cmp expect output
 
 '
@@ -112,8 +103,8 @@ cat >expect <<EOF
 EOF
 test_expect_success 'status -uno' '
 	mkdir dir3 &&
-	: > dir3/untracked1 &&
-	: > dir3/untracked2 &&
+	: >dir3/untracked1 &&
+	: >dir3/untracked2 &&
 	git status -uno >output &&
 	test_cmp expect output
 '
@@ -258,7 +249,7 @@ test_expect_success 'status -s (status.showUntrackedFiles all)' '
 	test_cmp expect output
 '
 
-cat > expect << \EOF
+cat >expect <<\EOF
 # On branch master
 # Changes to be committed:
 #   (use "git reset HEAD <file>..." to unstage)
@@ -284,12 +275,12 @@ EOF
 
 test_expect_success 'status with relative paths' '
 
-	(cd dir1 && git status) > output &&
+	(cd dir1 && git status) >output &&
 	test_cmp expect output
 
 '
 
-cat > expect << \EOF
+cat >expect <<\EOF
  M modified
 A  ../dir2/added
 ?? untracked
@@ -301,12 +292,12 @@ A  ../dir2/added
 EOF
 test_expect_success 'status -s with relative paths' '
 
-	(cd dir1 && git status -s) > output &&
+	(cd dir1 && git status -s) >output &&
 	test_cmp expect output
 
 '
 
-cat > expect << \EOF
+cat >expect <<\EOF
  M dir1/modified
 A  dir2/added
 ?? dir1/untracked
@@ -319,7 +310,7 @@ EOF
 
 test_expect_success 'status --porcelain ignores relative paths setting' '
 
-	(cd dir1 && git status --porcelain) > output &&
+	(cd dir1 && git status --porcelain) >output &&
 	test_cmp expect output
 
 '
@@ -330,7 +321,7 @@ test_expect_success 'setup unique colors' '
 
 '
 
-cat > expect << \EOF
+cat >expect <<\EOF
 # On branch master
 # Changes to be committed:
 #   (use "git reset HEAD <file>..." to unstage)
@@ -357,7 +348,7 @@ EOF
 test_expect_success 'status with color.ui' '
 
 	git config color.ui always &&
-	git status | decrypt_color > output &&
+	git status | test_decode_color >output &&
 	test_cmp expect output
 
 '
@@ -366,12 +357,12 @@ test_expect_success 'status with color.status' '
 
 	git config --unset color.ui &&
 	git config color.status always &&
-	git status | decrypt_color > output &&
+	git status | test_decode_color >output &&
 	test_cmp expect output
 
 '
 
-cat > expect << \EOF
+cat >expect <<\EOF
  <RED>M<RESET> dir1/modified
 <GREEN>A<RESET>  dir2/added
 <BLUE>??<RESET> dir1/untracked
@@ -386,7 +377,7 @@ test_expect_success 'status -s with color.ui' '
 
 	git config --unset color.status &&
 	git config color.ui always &&
-	git status -s | decrypt_color > output &&
+	git status -s | test_decode_color >output &&
 	test_cmp expect output
 
 '
@@ -395,12 +386,12 @@ test_expect_success 'status -s with color.status' '
 
 	git config --unset color.ui &&
 	git config color.status always &&
-	git status -s | decrypt_color > output &&
+	git status -s | test_decode_color >output &&
 	test_cmp expect output
 
 '
 
-cat > expect << \EOF
+cat >expect <<\EOF
  M dir1/modified
 A  dir2/added
 ?? dir1/untracked
@@ -415,7 +406,7 @@ test_expect_success 'status --porcelain ignores color.ui' '
 
 	git config --unset color.status &&
 	git config color.ui always &&
-	git status --porcelain | decrypt_color > output &&
+	git status --porcelain | test_decode_color >output &&
 	test_cmp expect output
 
 '
@@ -424,7 +415,7 @@ test_expect_success 'status --porcelain ignores color.status' '
 
 	git config --unset color.ui &&
 	git config color.status always &&
-	git status --porcelain | decrypt_color > output &&
+	git status --porcelain | test_decode_color >output &&
 	test_cmp expect output
 
 '
@@ -433,7 +424,7 @@ test_expect_success 'status --porcelain ignores color.status' '
 git config --unset color.status
 git config --unset color.ui
 
-cat > expect << \EOF
+cat >expect <<\EOF
 # On branch master
 # Changes to be committed:
 #   (use "git reset HEAD <file>..." to unstage)
@@ -461,12 +452,12 @@ EOF
 test_expect_success 'status without relative paths' '
 
 	git config status.relativePaths false
-	(cd dir1 && git status) > output &&
+	(cd dir1 && git status) >output &&
 	test_cmp expect output
 
 '
 
-cat > expect << \EOF
+cat >expect <<\EOF
  M dir1/modified
 A  dir2/added
 ?? dir1/untracked
@@ -479,7 +470,7 @@ EOF
 
 test_expect_success 'status -s without relative paths' '
 
-	(cd dir1 && git status -s) > output &&
+	(cd dir1 && git status -s) >output &&
 	test_cmp expect output
 
 '
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 5fdc5d9..d63ad2d 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -208,6 +208,17 @@ test_set_editor () {
 	export VISUAL
 }
 
+test_decode_color () {
+	sed	-e 's/.\[1m/<WHITE>/g' \
+		-e 's/.\[31m/<RED>/g' \
+		-e 's/.\[32m/<GREEN>/g' \
+		-e 's/.\[33m/<YELLOW>/g' \
+		-e 's/.\[34m/<BLUE>/g' \
+		-e 's/.\[35m/<MAGENTA>/g' \
+		-e 's/.\[36m/<CYAN>/g' \
+		-e 's/.\[m/<RESET>/g'
+}
+
 test_tick () {
 	if test -z "${test_tick+set}"
 	then
Michael J Gruber· Dec 9, 2009, 09:18 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/2] t7508-status: test all modes with color

Junio C Hamano venit, vidit, dixit 09.12.2009 06:32/06:44:
Show 32 quoted lines
> Michael J Gruber <git@drmicha.warpmail.net> writes:
> 
>> > Jakub Narebski venit, vidit, dixit 08.12.2009 12:10:
>>> >> Michael J Gruber wrote:
>>> >> 
>>>> >>> +decrypt_color () {
>>>> >>> +       sed \
>>>> >>> +               -e 's/.\[1m/<WHITE>/g' \
>>>> >>> +               -e 's/.\[31m/<RED>/g' \
>>>> >>> +               -e 's/.\[32m/<GREEN>/g' \
>>>> >>> +               -e 's/.\[34m/<BLUE>/g' \
>>>> >>> +               -e 's/.\[m/<RESET>/g'
>>>> >>> +}
>>> >> 
>>> >> Shouldn't this be better in test-lib.sh, or some common lib 
>>> >> (lib-color.sh or color-lib.sh; we are unfortunately a bit inconsistent
>>> >> in naming here)?
>> >
>> > Well, so far it's used in two places (and somewhat differently). I would
>> > say test-libification starts at 3 :)
> That is a pretty lame excuse and is a bad way to keep things maintainable.
> 
> Having two copies now means that you will *double* the chance for the next
> person to copy and paste one of the existing copies that are found in the
> non-library-ish part of the test script set to create the third duplicate,
> without even realizing that there already are two copies that should have
> been consolidated in the first place.  The worst part is that once that
> duplication is pointed out, s/he will use the existing two copies as an
> excuse for copy and paste.
> 
> Please don't.
>

Okay okay, I guess I have to spell out my smileys better in the future. The real question for us (Jakub and me) was where to put the code. I think by giving that info I could have been easily convinced to do that step...

Show 30 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
> 
>> Michael J Gruber <git@drmicha.warpmail.net> writes:
>>
>>> Jakub Narebski venit, vidit, dixit 08.12.2009 12:10:
>>>> Michael J Gruber wrote:
>>>>
>>>>> +decrypt_color () {
>>>>> +       sed \
>>>>> +               -e 's/.\[1m/<WHITE>/g' \
>>>>> +               -e 's/.\[31m/<RED>/g' \
>>>>> +               -e 's/.\[32m/<GREEN>/g' \
>>>>> +               -e 's/.\[34m/<BLUE>/g' \
>>>>> +               -e 's/.\[m/<RESET>/g'
>>>>> +}
>>>>
>>>> Shouldn't this be better in test-lib.sh, or some common lib 
>>>> (lib-color.sh or color-lib.sh; we are unfortunately a bit inconsistent
>>>> in naming here)?
>>>
>>> Well, so far it's used in two places (and somewhat differently). I would
>>> say test-libification starts at 3 :)
>> ...
>> Please don't.
> 
> I'll squash this in to fix it up.
> 
> I don't know where 36->BROWN mistake came from when color.h has a
> series of #define that can be used to make the decoding script
> mechanically, though ;-)

I don't know either, I didn't make it - I even corrected it in my copy - which proves your former point, of course.

Show 359 quoted lines
>  t/t4034-diff-words.sh |   23 ++++---------
>  t/t7508-status.sh     |   83 ++++++++++++++++++++++---------------------------
>  t/test-lib.sh         |   11 ++++++
>  3 files changed, 55 insertions(+), 62 deletions(-)
> 
> diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
> index 4508eff..ea895b0 100755
> --- a/t/t4034-diff-words.sh
> +++ b/t/t4034-diff-words.sh
> @@ -11,18 +11,9 @@ test_expect_success setup '
>  
>  '
>  
> -decrypt_color () {
> -	sed \
> -		-e 's/.\[1m/<WHITE>/g' \
> -		-e 's/.\[31m/<RED>/g' \
> -		-e 's/.\[32m/<GREEN>/g' \
> -		-e 's/.\[36m/<BROWN>/g' \
> -		-e 's/.\[m/<RESET>/g'
> -}
> -
>  word_diff () {
>  	test_must_fail git diff --no-index "$@" pre post > output &&
> -	decrypt_color < output > output.decrypted &&
> +	test_decode_color <output >output.decrypted &&
>  	test_cmp expect output.decrypted
>  }
>  
> @@ -47,7 +38,7 @@ cat > expect <<\EOF
>  <WHITE>index 330b04f..5ed8eff 100644<RESET>
>  <WHITE>--- a/pre<RESET>
>  <WHITE>+++ b/post<RESET>
> -<BROWN>@@ -1,3 +1,7 @@<RESET>
> +<CYAN>@@ -1,3 +1,7 @@<RESET>
>  <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
>  <RESET>
>  a = b + c<RESET>
> @@ -68,7 +59,7 @@ cat > expect <<\EOF
>  <WHITE>index 330b04f..5ed8eff 100644<RESET>
>  <WHITE>--- a/pre<RESET>
>  <WHITE>+++ b/post<RESET>
> -<BROWN>@@ -1,3 +1,7 @@<RESET>
> +<CYAN>@@ -1,3 +1,7 @@<RESET>
>  h(4),<GREEN>hh<RESET>[44]
>  <RESET>
>  a = b + c<RESET>
> @@ -104,7 +95,7 @@ cat > expect <<\EOF
>  <WHITE>index 330b04f..5ed8eff 100644<RESET>
>  <WHITE>--- a/pre<RESET>
>  <WHITE>+++ b/post<RESET>
> -<BROWN>@@ -1,3 +1,7 @@<RESET>
> +<CYAN>@@ -1,3 +1,7 @@<RESET>
>  h(4)<GREEN>,hh[44]<RESET>
>  <RESET>
>  a = b + c<RESET>
> @@ -146,7 +137,7 @@ cat > expect <<\EOF
>  <WHITE>index 330b04f..5ed8eff 100644<RESET>
>  <WHITE>--- a/pre<RESET>
>  <WHITE>+++ b/post<RESET>
> -<BROWN>@@ -1,3 +1,7 @@<RESET>
> +<CYAN>@@ -1,3 +1,7 @@<RESET>
>  h(4),<GREEN>hh[44<RESET>]
>  <RESET>
>  a = b + c<RESET>
> @@ -168,7 +159,7 @@ cat > expect <<\EOF
>  <WHITE>index c29453b..be22f37 100644<RESET>
>  <WHITE>--- a/pre<RESET>
>  <WHITE>+++ b/post<RESET>
> -<BROWN>@@ -1 +1 @@<RESET>
> +<CYAN>@@ -1 +1 @@<RESET>
>  aaa (aaa) <GREEN>aaa<RESET>
>  EOF
>  
> @@ -187,7 +178,7 @@ cat > expect <<\EOF
>  <WHITE>index 289cb9d..2d06f37 100644<RESET>
>  <WHITE>--- a/pre<RESET>
>  <WHITE>+++ b/post<RESET>
> -<BROWN>@@ -1 +1 @@<RESET>
> +<CYAN>@@ -1 +1 @@<RESET>
>  (<RED>:<RESET>
>  EOF
>  
> diff --git a/t/t7508-status.sh b/t/t7508-status.sh
> index 50554a0..cf67fe3 100755
> --- a/t/t7508-status.sh
> +++ b/t/t7508-status.sh
> @@ -8,45 +8,36 @@ test_description='git status'
>  . ./test-lib.sh
>  
>  test_expect_success 'setup' '
> -	: > tracked &&
> -	: > modified &&
> +	: >tracked &&
> +	: >modified &&
>  	mkdir dir1 &&
> -	: > dir1/tracked &&
> -	: > dir1/modified &&
> +	: >dir1/tracked &&
> +	: >dir1/modified &&
>  	mkdir dir2 &&
> -	: > dir1/tracked &&
> -	: > dir1/modified &&
> +	: >dir1/tracked &&
> +	: >dir1/modified &&
>  	git add . &&
>  
>  	git status >output &&
>  
>  	test_tick &&
>  	git commit -m initial &&
> -	: > untracked &&
> -	: > dir1/untracked &&
> -	: > dir2/untracked &&
> -	echo 1 > dir1/modified &&
> -	echo 2 > dir2/modified &&
> -	echo 3 > dir2/added &&
> +	: >untracked &&
> +	: >dir1/untracked &&
> +	: >dir2/untracked &&
> +	echo 1 >dir1/modified &&
> +	echo 2 >dir2/modified &&
> +	echo 3 >dir2/added &&
>  	git add dir2/added
>  '
>  
> -decrypt_color () {
> -	sed \
> -		-e 's/.\[1m/<WHITE>/g' \
> -		-e 's/.\[31m/<RED>/g' \
> -		-e 's/.\[32m/<GREEN>/g' \
> -		-e 's/.\[34m/<BLUE>/g' \
> -		-e 's/.\[m/<RESET>/g'
> -}
> -
>  test_expect_success 'status (1)' '
>  
>  	grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
>  
>  '
>  
> -cat > expect << \EOF
> +cat >expect <<\EOF
>  # On branch master
>  # Changes to be committed:
>  #   (use "git reset HEAD <file>..." to unstage)
> @@ -72,12 +63,12 @@ EOF
>  
>  test_expect_success 'status (2)' '
>  
> -	git status > output &&
> +	git status >output &&
>  	test_cmp expect output
>  
>  '
>  
> -cat > expect << \EOF
> +cat >expect <<\EOF
>   M dir1/modified
>  A  dir2/added
>  ?? dir1/untracked
> @@ -90,7 +81,7 @@ EOF
>  
>  test_expect_success 'status -s (2)' '
>  
> -	git status -s > output &&
> +	git status -s >output &&
>  	test_cmp expect output
>  
>  '
> @@ -112,8 +103,8 @@ cat >expect <<EOF
>  EOF
>  test_expect_success 'status -uno' '
>  	mkdir dir3 &&
> -	: > dir3/untracked1 &&
> -	: > dir3/untracked2 &&
> +	: >dir3/untracked1 &&
> +	: >dir3/untracked2 &&
>  	git status -uno >output &&
>  	test_cmp expect output
>  '
> @@ -258,7 +249,7 @@ test_expect_success 'status -s (status.showUntrackedFiles all)' '
>  	test_cmp expect output
>  '
>  
> -cat > expect << \EOF
> +cat >expect <<\EOF
>  # On branch master
>  # Changes to be committed:
>  #   (use "git reset HEAD <file>..." to unstage)
> @@ -284,12 +275,12 @@ EOF
>  
>  test_expect_success 'status with relative paths' '
>  
> -	(cd dir1 && git status) > output &&
> +	(cd dir1 && git status) >output &&
>  	test_cmp expect output
>  
>  '
>  
> -cat > expect << \EOF
> +cat >expect <<\EOF
>   M modified
>  A  ../dir2/added
>  ?? untracked
> @@ -301,12 +292,12 @@ A  ../dir2/added
>  EOF
>  test_expect_success 'status -s with relative paths' '
>  
> -	(cd dir1 && git status -s) > output &&
> +	(cd dir1 && git status -s) >output &&
>  	test_cmp expect output
>  
>  '
>  
> -cat > expect << \EOF
> +cat >expect <<\EOF
>   M dir1/modified
>  A  dir2/added
>  ?? dir1/untracked
> @@ -319,7 +310,7 @@ EOF
>  
>  test_expect_success 'status --porcelain ignores relative paths setting' '
>  
> -	(cd dir1 && git status --porcelain) > output &&
> +	(cd dir1 && git status --porcelain) >output &&
>  	test_cmp expect output
>  
>  '
> @@ -330,7 +321,7 @@ test_expect_success 'setup unique colors' '
>  
>  '
>  
> -cat > expect << \EOF
> +cat >expect <<\EOF
>  # On branch master
>  # Changes to be committed:
>  #   (use "git reset HEAD <file>..." to unstage)
> @@ -357,7 +348,7 @@ EOF
>  test_expect_success 'status with color.ui' '
>  
>  	git config color.ui always &&
> -	git status | decrypt_color > output &&
> +	git status | test_decode_color >output &&
>  	test_cmp expect output
>  
>  '
> @@ -366,12 +357,12 @@ test_expect_success 'status with color.status' '
>  
>  	git config --unset color.ui &&
>  	git config color.status always &&
> -	git status | decrypt_color > output &&
> +	git status | test_decode_color >output &&
>  	test_cmp expect output
>  
>  '
>  
> -cat > expect << \EOF
> +cat >expect <<\EOF
>   <RED>M<RESET> dir1/modified
>  <GREEN>A<RESET>  dir2/added
>  <BLUE>??<RESET> dir1/untracked
> @@ -386,7 +377,7 @@ test_expect_success 'status -s with color.ui' '
>  
>  	git config --unset color.status &&
>  	git config color.ui always &&
> -	git status -s | decrypt_color > output &&
> +	git status -s | test_decode_color >output &&
>  	test_cmp expect output
>  
>  '
> @@ -395,12 +386,12 @@ test_expect_success 'status -s with color.status' '
>  
>  	git config --unset color.ui &&
>  	git config color.status always &&
> -	git status -s | decrypt_color > output &&
> +	git status -s | test_decode_color >output &&
>  	test_cmp expect output
>  
>  '
>  
> -cat > expect << \EOF
> +cat >expect <<\EOF
>   M dir1/modified
>  A  dir2/added
>  ?? dir1/untracked
> @@ -415,7 +406,7 @@ test_expect_success 'status --porcelain ignores color.ui' '
>  
>  	git config --unset color.status &&
>  	git config color.ui always &&
> -	git status --porcelain | decrypt_color > output &&
> +	git status --porcelain | test_decode_color >output &&
>  	test_cmp expect output
>  
>  '
> @@ -424,7 +415,7 @@ test_expect_success 'status --porcelain ignores color.status' '
>  
>  	git config --unset color.ui &&
>  	git config color.status always &&
> -	git status --porcelain | decrypt_color > output &&
> +	git status --porcelain | test_decode_color >output &&
>  	test_cmp expect output
>  
>  '
> @@ -433,7 +424,7 @@ test_expect_success 'status --porcelain ignores color.status' '
>  git config --unset color.status
>  git config --unset color.ui
>  
> -cat > expect << \EOF
> +cat >expect <<\EOF
>  # On branch master
>  # Changes to be committed:
>  #   (use "git reset HEAD <file>..." to unstage)
> @@ -461,12 +452,12 @@ EOF
>  test_expect_success 'status without relative paths' '
>  
>  	git config status.relativePaths false
> -	(cd dir1 && git status) > output &&
> +	(cd dir1 && git status) >output &&
>  	test_cmp expect output
>  
>  '
>  
> -cat > expect << \EOF
> +cat >expect <<\EOF
>   M dir1/modified
>  A  dir2/added
>  ?? dir1/untracked
> @@ -479,7 +470,7 @@ EOF
>  
>  test_expect_success 'status -s without relative paths' '
>  
> -	(cd dir1 && git status -s) > output &&
> +	(cd dir1 && git status -s) >output &&
>  	test_cmp expect output
>  
>  '
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 5fdc5d9..d63ad2d 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -208,6 +208,17 @@ test_set_editor () {
>  	export VISUAL
>  }
>  
> +test_decode_color () {
> +	sed	-e 's/.\[1m/<WHITE>/g' \
> +		-e 's/.\[31m/<RED>/g' \
> +		-e 's/.\[32m/<GREEN>/g' \
> +		-e 's/.\[33m/<YELLOW>/g' \
> +		-e 's/.\[34m/<BLUE>/g' \
> +		-e 's/.\[35m/<MAGENTA>/g' \
> +		-e 's/.\[36m/<CYAN>/g' \
> +		-e 's/.\[m/<RESET>/g'
> +}
> +
>  test_tick () {
>  	if test -z "${test_tick+set}"
>  	then

Regarding the larger part of your change: Is there a specific reason for ">output" rather than "> output" or just a style issue? I was simply following the style which I found present in t7508 (same goes for empty leading and trailing lines in the test bodies).

Michael
Junio C Hamano· Dec 9, 2009, 21:59 UTC · re: Michael J Gruber · lore

Re: [PATCH 2/2] t7508-status: test all modes with color

Michael J Gruber <git@drmicha.warpmail.net> writes:
> Regarding the larger part of your change: Is there a specific reason for
> ...
> ">output" rather than "> output" or just a style issue?
Yeah, I shouldn't have included these style fixes in there.

← back to recent threads