All of lore.kernel.org
 help / color / mirror / Atom feed
From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 02/21] t3206: make hash size independent
Date: Fri,  7 Feb 2020 00:52:35 +0000	[thread overview]
Message-ID: <20200207005254.1495851-3-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20200207005254.1495851-1-sandals@crustytoothpaste.net>

Fix the one assertion in this test that still uses SHA-1 to use test_oid
to be independent of the hash.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t3206-range-diff.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index 0575dd72b1..bd808f87ed 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -102,6 +102,14 @@ test_expect_success 'setup' '
 	n3 sha256:3b0a644
 	n4 sha256:e461653
 
+	# mode change
+	o1 sha1:4d39cb3
+	o2 sha1:26c107f
+	o3 sha1:4c1e0f5
+	o1 sha256:d0dd598
+	o2 sha256:c4a279e
+	o3 sha256:78459d7
+
 	# added and removed
 	s1 sha1:096b1ba
 	s2 sha1:d92e698
@@ -336,7 +344,7 @@ test_expect_success 'renamed file' '
 test_expect_success 'file with mode only change' '
 	git range-diff --no-color --submodule=log topic...mode-only-change >actual &&
 	sed s/Z/\ /g >expect <<-EOF &&
-	1:  fccce22 ! 1:  4d39cb3 s/4/A/
+	1:  $(test_oid t2) ! 1:  $(test_oid o1) s/4/A/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -352,7 +360,7 @@ test_expect_success 'file with mode only change' '
 	    Z 7
 	    +
 	    + ## other-file (new) ##
-	2:  147e64e ! 2:  26c107f s/11/B/
+	2:  $(test_oid t3) ! 2:  $(test_oid o2) s/11/B/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -368,7 +376,7 @@ test_expect_success 'file with mode only change' '
 	    Z 14
 	    +
 	    + ## other-file (mode change 100644 => 100755) ##
-	3:  a63e992 = 3:  4c1e0f5 s/12/B/
+	3:  $(test_oid t4) = 3:  $(test_oid o3) s/12/B/
 	EOF
 	test_cmp expect actual
 '

  parent reply	other threads:[~2020-02-07  0:53 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-07  0:52 [PATCH v3 00/21] SHA-256 test fixes, part 8 brian m. carlson
2020-02-07  0:52 ` [PATCH v3 01/21] t/lib-pack: support SHA-256 brian m. carlson
2020-02-07  0:52 ` brian m. carlson [this message]
2020-02-07  0:52 ` [PATCH v3 03/21] t3308: make test work with SHA-256 brian m. carlson
2020-02-07  0:52 ` [PATCH v3 04/21] t3309: " brian m. carlson
2020-02-07  0:52 ` [PATCH v3 05/21] t3310: " brian m. carlson
2020-02-07  0:52 ` [PATCH v3 06/21] t3311: " brian m. carlson
2020-02-07  0:52 ` [PATCH v3 07/21] t4013: make test hash independent brian m. carlson
2020-02-07  0:52 ` [PATCH v3 08/21] t4211: move SHA-1-specific test cases into a directory brian m. carlson
2020-02-07  0:52 ` [PATCH v3 09/21] t4211: add test cases for SHA-256 brian m. carlson
2020-02-07  0:52 ` [PATCH v3 10/21] t4060: make test work with SHA-256 brian m. carlson
2020-02-07  0:52 ` [PATCH v3 11/21] t5302: make hash size independent brian m. carlson
2020-02-07  0:52 ` [PATCH v3 12/21] t5309: make test hash independent brian m. carlson
2020-02-07  0:52 ` [PATCH v3 13/21] t5313: " brian m. carlson
2020-02-07  0:52 ` [PATCH v3 14/21] t5321: " brian m. carlson
2020-02-07  0:52 ` [PATCH v3 15/21] t5515: " brian m. carlson
2020-02-07  0:52 ` [PATCH v3 16/21] t5318: update for SHA-256 brian m. carlson
2020-02-07  0:52 ` [PATCH v3 17/21] t5607: make hash size independent brian m. carlson
2020-02-07  0:52 ` [PATCH v3 18/21] t5703: make test work with SHA-256 brian m. carlson
2020-02-07  0:52 ` [PATCH v3 19/21] t6000: abstract away SHA-1-specific constants brian m. carlson
2020-02-07  0:52 ` [PATCH v3 20/21] t6006: make hash size independent brian m. carlson
2020-02-07  0:52 ` [PATCH v3 21/21] t6024: update for SHA-256 brian m. carlson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200207005254.1495851-3-sandals@crustytoothpaste.net \
    --to=sandals@crustytoothpaste.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.