From patchwork Tue Jul 28 23:34:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 11690111 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE23E13B1 for ; Tue, 28 Jul 2020 23:35:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D667320829 for ; Tue, 28 Jul 2020 23:35:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="gMEtM4dL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730429AbgG1Xfj (ORCPT ); Tue, 28 Jul 2020 19:35:39 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40966 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730305AbgG1Xfa (ORCPT ); Tue, 28 Jul 2020 19:35:30 -0400 Received: from camp.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:b610:a2f0:36c1:12e3]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id 12E516100C; Tue, 28 Jul 2020 23:34:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1595979299; bh=+PqxO8ska++rKIP2kfK1D/tpsnkaFSXfLGOy/Y1ZYlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=gMEtM4dLG3B1IzydU9btDZEsquO+gRvPSb8fGfiYb0o25AOxnnh+oC3XZY0wxzA+F VmE8YotLU3D3EXv6ex1b/6MSBvETyg3lnp38SudU99yfPwnekdfDPOcq9Zq+mrmaoi O28Q5ObTUF8K0iTuYXaCiWoyLHQYYveqABz8G0wdXAgZapt3VaZNBclImo8iBf6yF8 eaaKssrr01H4SO1oeTExl2jeUSyayiiyIZGoeJlLAR6VHZF8yLk/e6XjdG03HjBNXi uYpWnxgx9M7MAbeJftXpVLl+4mEpv2UWH6QNe5ujrRLarhmrwDjGzoKZX8tbCn8BB/ uPJ7tITMtfiFGv7JY9+70pX4+LLvevaNO6MXkTkmytyxM4WI7WqyAojVCv9KoUdIct ycr3m9oZvJvyAgIDBwjON9SaBYjmDr0BBsf94VoAMxkSHoRzG8ztbMMv40YpvOFDtw +YJfb6ujNqklS83dJU1RUEePkN6CoUkTVvAA9wTU4x4fvJRnW9L From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v5 09/39] t6501: avoid hard-coded objects Date: Tue, 28 Jul 2020 23:34:16 +0000 Message-Id: <20200728233446.3066485-10-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6 In-Reply-To: <20200728233446.3066485-1-sandals@crustytoothpaste.net> References: <20200728233446.3066485-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This test contains hard-coded invalid object IDs. Make it hash size independent by generating invalid object IDs using the translation tables. Add a setup target to ensure the output of test_oid_init is checked properly. Signed-off-by: brian m. carlson --- t/t6501-freshen-objects.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/t/t6501-freshen-objects.sh b/t/t6501-freshen-objects.sh index f30b4849b6..7416ed5ffe 100755 --- a/t/t6501-freshen-objects.sh +++ b/t/t6501-freshen-objects.sh @@ -45,6 +45,10 @@ maybe_repack () { fi } +test_expect_success 'setup' ' + test_oid_init +' + for repack in '' true; do title=${repack:+repack} title=${title:-loose} @@ -128,9 +132,9 @@ for repack in '' true; do done test_expect_success 'do not complain about existing broken links (commit)' ' - cat >broken-commit <<-\EOF && - tree 0000000000000000000000000000000000000001 - parent 0000000000000000000000000000000000000002 + cat >broken-commit <<-EOF && + tree $(test_oid 001) + parent $(test_oid 002) author whatever 1234 -0000 committer whatever 1234 -0000 @@ -143,8 +147,8 @@ test_expect_success 'do not complain about existing broken links (commit)' ' ' test_expect_success 'do not complain about existing broken links (tree)' ' - cat >broken-tree <<-\EOF && - 100644 blob 0000000000000000000000000000000000000003 foo + cat >broken-tree <<-EOF && + 100644 blob $(test_oid 003) foo EOF tree=$(git mktree --missing stderr && @@ -153,8 +157,8 @@ test_expect_success 'do not complain about existing broken links (tree)' ' ' test_expect_success 'do not complain about existing broken links (tag)' ' - cat >broken-tag <<-\EOF && - object 0000000000000000000000000000000000000004 + cat >broken-tag <<-EOF && + object $(test_oid 004) type commit tag broken tagger whatever 1234 -0000