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>
Subject: [PATCH 23/38] t9301: make hash size independent
Date: Fri, 10 Jul 2020 02:47:13 +0000	[thread overview]
Message-ID: <20200710024728.3100527-24-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20200710024728.3100527-1-sandals@crustytoothpaste.net>

Instead of using a hard-coded all-zeros object ID, use $ZERO_OID.
Compute the length of the object IDs in use and use this instead of
hard-coding the constant 40.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t9301-fast-import-notes.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/t/t9301-fast-import-notes.sh b/t/t9301-fast-import-notes.sh
index ca223dca98..9d1aaac980 100755
--- a/t/t9301-fast-import-notes.sh
+++ b/t/t9301-fast-import-notes.sh
@@ -71,7 +71,7 @@ EOF
 INPUT_END
 
 test_expect_success 'set up master branch' '
-
+	test_oid_init &&
 	git fast-import <input &&
 	git whatchanged master
 '
@@ -470,12 +470,13 @@ test_expect_success 'add lots of commits and notes' '
 '
 
 test_expect_success 'verify that lots of notes trigger a fanout scheme' '
+	hexsz=$(test_oid hexsz) &&
 
 	# None of the entries in the top-level notes tree should be a full SHA1
 	git ls-tree --name-only refs/notes/many_notes |
 	while read path
 	do
-		if test $(expr length "$path") -ge 40
+		if test $(expr length "$path") -ge $hexsz
 		then
 			return 1
 		fi
@@ -518,7 +519,7 @@ test_expect_success 'verify that importing a notes tree respects the fanout sche
 	git ls-tree --name-only refs/notes/other_notes |
 	while read path
 	do
-		if test $(expr length "$path") -ge 40
+		if test $(expr length "$path") -ge $hexsz
 		then
 			return 1
 		fi
@@ -593,7 +594,7 @@ test_expect_success 'verify that changing notes respect existing fanout' '
 	git ls-tree --name-only refs/notes/many_notes |
 	while read path
 	do
-		if test $(expr length "$path") -ge 40
+		if test $(expr length "$path") -ge $hexsz
 		then
 			return 1
 		fi
@@ -616,7 +617,7 @@ i=$(($num_commits - $remaining_notes))
 for sha1 in $(git rev-list -n $i refs/heads/many_commits)
 do
 	cat >>input <<INPUT_END
-N 0000000000000000000000000000000000000000 $sha1
+N $ZERO_OID $sha1
 INPUT_END
 done
 
@@ -646,7 +647,6 @@ test_expect_success 'remove lots of notes' '
 '
 
 test_expect_success 'verify that removing notes trigger fanout consolidation' '
-
 	# All entries in the top-level notes tree should be a full SHA1
 	git ls-tree --name-only -r refs/notes/many_notes |
 	while read path
@@ -656,7 +656,7 @@ test_expect_success 'verify that removing notes trigger fanout consolidation' '
 		test "$path" = "deadbeef" && continue
 		test "$path" = "de/adbeef" && continue
 
-		if test $(expr length "$path") -ne 40
+		if test $(expr length "$path") -ne $hexsz
 		then
 			return 1
 		fi

  parent reply	other threads:[~2020-07-10  2:48 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-10  2:46 [PATCH 00/38] SHA-256, part 3/3 brian m. carlson
2020-07-10  2:46 ` [PATCH 01/38] t: make test-bloom initialize repository brian m. carlson
2020-07-10  2:46 ` [PATCH 02/38] t1001: use $ZERO_OID brian m. carlson
2020-07-10  2:46 ` [PATCH 03/38] t3305: make hash agnostic brian m. carlson
2020-07-10  2:46 ` [PATCH 04/38] t3404: prepare 'short SHA-1 collision' tests for SHA-256 brian m. carlson
2020-07-10  2:46 ` [PATCH 05/38] t6100: make hash size independent brian m. carlson
2020-07-10  2:46 ` [PATCH 06/38] t6101: " brian m. carlson
2020-07-10  2:46 ` [PATCH 07/38] t6301: " brian m. carlson
2020-07-10  2:46 ` [PATCH 08/38] t6500: specify test values for SHA-256 brian m. carlson
2020-07-10  2:46 ` [PATCH 09/38] t6501: avoid hard-coded objects brian m. carlson
2020-07-10  2:47 ` [PATCH 10/38] t7003: compute appropriate length constant brian m. carlson
2020-07-10  2:47 ` [PATCH 11/38] t7063: make hash size independent brian m. carlson
2020-07-11  0:43   ` Junio C Hamano
2020-07-11  0:54     ` brian m. carlson
2020-07-10  2:47 ` [PATCH 12/38] t7201: abstract away SHA-1-specific constants brian m. carlson
2020-07-10  2:47 ` [PATCH 13/38] t7102: " brian m. carlson
2020-07-10  2:47 ` [PATCH 14/38] t7400: make hash size independent brian m. carlson
2020-07-10  2:47 ` [PATCH 15/38] t7405: " brian m. carlson
2020-07-10  2:47 ` [PATCH 16/38] t7506: avoid checking for SHA-1-specific constants brian m. carlson
2020-07-10  2:47 ` [PATCH 17/38] t7508: use $ZERO_OID instead of hard-coded constant brian m. carlson
2020-07-10  2:47 ` [PATCH 18/38] t8002: make hash size independent brian m. carlson
2020-07-10  2:47 ` [PATCH 19/38] t8003: " brian m. carlson
2020-07-10  2:47 ` [PATCH 20/38] t8011: " brian m. carlson
2020-07-10  2:47 ` [PATCH 21/38] t9300: abstract away SHA-1-specific constants brian m. carlson
2020-07-10  2:47 ` [PATCH 22/38] t9300: use $ZERO_OID instead of hard-coded object ID brian m. carlson
2020-07-10  2:47 ` brian m. carlson [this message]
2020-07-10  2:47 ` [PATCH 24/38] t9350: make hash size independent brian m. carlson
2020-07-10  2:47 ` [PATCH 25/38] t9500: ensure that algorithm info is preserved in config brian m. carlson
2020-07-10  2:47 ` [PATCH 26/38] t9700: make hash size independent brian m. carlson
2020-07-10  2:47 ` [PATCH 27/38] t5308: make test work with SHA-256 brian m. carlson
2020-07-10  2:47 ` [PATCH 28/38] t0410: mark test with SHA1 prerequisite brian m. carlson
2020-07-10  2:47 ` [PATCH 29/38] http-fetch: set up git directory before parsing pack hashes brian m. carlson
2020-07-10  2:47 ` [PATCH 30/38] builtin/verify-pack: implement an --object-format option brian m. carlson
2020-07-10  2:47 ` [PATCH 31/38] setup: add support for reading extensions.objectformat brian m. carlson
2020-07-10  2:47 ` [PATCH 32/38] Enable SHA-256 support by default brian m. carlson
2020-07-10  2:47 ` [PATCH 33/38] t: add test_oid option to select hash algorithm brian m. carlson
2020-07-10  2:47 ` [PATCH 34/38] t: allow testing different hash algorithms via environment brian m. carlson
2020-07-10  2:47 ` [PATCH 35/38] t: make SHA1 prerequisite depend on default hash brian m. carlson
2020-07-12  2:13   ` Denton Liu
2020-07-12 17:34     ` Junio C Hamano
2020-07-10  2:47 ` [PATCH 36/38] ci: run tests with SHA-256 brian m. carlson
2020-07-10 15:09   ` Derrick Stolee
2020-07-10  2:47 ` [PATCH 37/38] docs: add documentation for extensions.objectFormat brian m. carlson
2020-07-10 20:21   ` Martin Ågren
2020-07-10  2:47 ` [PATCH 38/38] t: remove test_oid_init in tests brian m. carlson
2020-07-10 15:14 ` [PATCH 00/38] SHA-256, part 3/3 Derrick Stolee
2020-07-10 19:55   ` brian m. carlson
2020-07-10 20:15     ` Junio C Hamano
2020-07-11  0:37     ` Junio C Hamano
2020-07-11  1:06       ` 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=20200710024728.3100527-24-sandals@crustytoothpaste.net \
    --to=sandals@crustytoothpaste.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    /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.