diff mbox series

[v6,4/6] t-reftable-stack: use reftable_ref_record_equal() to compare ref records

Message ID 20240908041632.4948-5-chandrapratap3519@gmail.com (mailing list archive)
State Accepted
Commit 1052280136cab7698e325289f6fac2af8fd7534e
Headers show
Series t: port reftable/stack_test.c to the unit testing framework | expand

Commit Message

Chandra Pratap Sept. 8, 2024, 4:05 a.m. UTC
In the current stack tests, ref records are compared for equality
by sometimes using the dedicated function for ref-record comparison,
reftable_ref_record_equal(), and sometimes by explicity comparing
contents of the ref records.

The latter method is undesired because there can exist unequal ref
records with the some of the contents being equal. Replace the latter
instances of ref-record comparison with the former. This has the
added benefit of preserving uniformity throughout the test file.

Mentored-by: Patrick Steinhardt <ps@pks.im>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com>
---
 t/unit-tests/t-reftable-stack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Patrick Steinhardt Sept. 9, 2024, 11:42 a.m. UTC | #1
On Sun, Sep 08, 2024 at 09:35:59AM +0530, Chandra Pratap wrote:
> In the current stack tests, ref records are compared for equality
> by sometimes using the dedicated function for ref-record comparison,
> reftable_ref_record_equal(), and sometimes by explicity comparing
> contents of the ref records.
> 
> The latter method is undesired because there can exist unequal ref
> records with the some of the contents being equal. Replace the latter

s/the some/some

Not worth a reroll, just pointing it out in case you end up rerolling
due to other issues.

Patrick
diff mbox series

Patch

diff --git a/t/unit-tests/t-reftable-stack.c b/t/unit-tests/t-reftable-stack.c
index 8047e25c48..4f2ef1a8cc 100644
--- a/t/unit-tests/t-reftable-stack.c
+++ b/t/unit-tests/t-reftable-stack.c
@@ -174,7 +174,7 @@  static void t_reftable_stack_add_one(void)
 
 	err = reftable_stack_read_ref(st, ref.refname, &dest);
 	check(!err);
-	check_str("master", dest.value.symref);
+	check(reftable_ref_record_equal(&ref, &dest, GIT_SHA1_RAWSZ));
 	check_int(st->readers_len, >, 0);
 
 #ifndef GIT_WINDOWS_NATIVE
@@ -285,7 +285,7 @@  static void t_reftable_stack_transaction_api(void)
 	err = reftable_stack_read_ref(st, ref.refname, &dest);
 	check(!err);
 	check_int(REFTABLE_REF_SYMREF, ==, dest.value_type);
-	check_str("master", dest.value.symref);
+	check(reftable_ref_record_equal(&ref, &dest, GIT_SHA1_RAWSZ));
 
 	reftable_ref_record_release(&dest);
 	reftable_stack_destroy(st);