From 2db83efdef43311c7ede2bbd98141f4537c37ad8 Mon Sep 17 00:00:00 2001 From: Guilherme Lawless Date: Wed, 25 Mar 2020 15:33:43 +0000 Subject: [PATCH 1/2] Fix intermittent failure in active_transactions.confirmation_consistency `recently_cemented` is only changed in the conf height observer callbacks. This is the intended behavior, but the test was intermittently failing under TSAN. --- nano/core_test/active_transactions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nano/core_test/active_transactions.cpp b/nano/core_test/active_transactions.cpp index 8bf8ac3a94..9080ea4c41 100644 --- a/nano/core_test/active_transactions.cpp +++ b/nano/core_test/active_transactions.cpp @@ -849,7 +849,7 @@ TEST (active_transactions, confirmation_consistency) nano::lock_guard guard (node.active.mutex); ASSERT_EQ (i + 1, node.active.recently_confirmed.size ()); ASSERT_EQ (block->qualified_root (), node.active.recently_confirmed.back ().first); - ASSERT_EQ (i + 1, node.active.recently_cemented.size ()); + ASSERT_TIMELY (1s, i + 1 == node.active.recently_cemented.size ()); // done after a callback } } } From eaab971865e7f248d4501f368f1a6fd2a0b8346f Mon Sep 17 00:00:00 2001 From: Guilherme Lawless Date: Wed, 25 Mar 2020 23:03:18 +0000 Subject: [PATCH 2/2] Empty commit