From ad043f8e3304aab4f0ee3ad9e0cf8480c4bbadf0 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 24 Mar 2022 16:10:22 +0100 Subject: [PATCH] Always call WaitForInFlightClusters before checking cluster IDs --- tree/ntuple/v7/test/ntuple_cluster.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tree/ntuple/v7/test/ntuple_cluster.cxx b/tree/ntuple/v7/test/ntuple_cluster.cxx index afc2fc32e9..0c299d97de 100644 --- a/tree/ntuple/v7/test/ntuple_cluster.cxx +++ b/tree/ntuple/v7/test/ntuple_cluster.cxx @@ -213,6 +213,7 @@ TEST(ClusterPool, GetClusterBasics) RPageSourceMock p1; RClusterPool c1(p1, 1); c1.GetCluster(3, {0}); + c1.WaitForInFlightClusters(); ASSERT_EQ(2U, p1.fReqsClusterIds.size()); EXPECT_EQ(3U, p1.fReqsClusterIds[0]); EXPECT_EQ(4U, p1.fReqsClusterIds[1]); @@ -267,11 +268,13 @@ TEST(ClusterPool, GetClusterIncrementally) RPageSourceMock p1; RClusterPool c1(p1, 1); c1.GetCluster(3, {0}); + c1.WaitForInFlightClusters(); ASSERT_EQ(2U, p1.fReqsClusterIds.size()); EXPECT_EQ(3U, p1.fReqsClusterIds[0]); EXPECT_EQ(RCluster::ColumnSet_t({0}), p1.fReqsColumns[0]); c1.GetCluster(3, {1}); + c1.WaitForInFlightClusters(); ASSERT_EQ(4U, p1.fReqsClusterIds.size()); EXPECT_EQ(3U, p1.fReqsClusterIds[2]); EXPECT_EQ(RCluster::ColumnSet_t({1}), p1.fReqsColumns[2]); -- 2.35.1