From bbad4f0668f2c7c0ddd8d1706804a6469e7ed0ce Mon Sep 17 00:00:00 2001 From: Badrish Chandramouli Date: Sat, 8 Mar 2025 13:37:28 -0800 Subject: [PATCH] fix test as versions are different due to unified ckpt --- .../ClusterReplicationDisklessSyncTests.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/Garnet.test.cluster/ReplicationTests/ClusterReplicationDisklessSyncTests.cs b/test/Garnet.test.cluster/ReplicationTests/ClusterReplicationDisklessSyncTests.cs index a8075f0716..325f74d57a 100644 --- a/test/Garnet.test.cluster/ReplicationTests/ClusterReplicationDisklessSyncTests.cs +++ b/test/Garnet.test.cluster/ReplicationTests/ClusterReplicationDisklessSyncTests.cs @@ -236,7 +236,9 @@ public void ClusterDBVersionAlignmentDisklessSync([Values] bool disableObjects, // Validate db version var primaryVersion = context.clusterTestUtils.GetStoreCurrentVersion(primaryIndex, isMainStore: true, logger: context.logger); var replicaOneVersion = context.clusterTestUtils.GetStoreCurrentVersion(replicaOneIndex, isMainStore: true, logger: context.logger); - ClassicAssert.AreEqual(2, primaryVersion); + + var expectedVersion1 = disableObjects ? 2 : 3; + ClassicAssert.AreEqual(expectedVersion1, primaryVersion); ClassicAssert.AreEqual(primaryVersion, replicaOneVersion); // Reset and re-attach replica as primary @@ -258,9 +260,10 @@ public void ClusterDBVersionAlignmentDisklessSync([Values] bool disableObjects, primaryVersion = context.clusterTestUtils.GetStoreCurrentVersion(primaryIndex, isMainStore: true, logger: context.logger); replicaOneVersion = context.clusterTestUtils.GetStoreCurrentVersion(replicaOneIndex, isMainStore: true, logger: context.logger); var replicaTwoVersion = context.clusterTestUtils.GetStoreCurrentVersion(replicaTwoIndex, isMainStore: true, logger: context.logger); - ClassicAssert.AreEqual(3, primaryVersion); + var expectedVersion2 = disableObjects ? 3 : 5; + ClassicAssert.AreEqual(expectedVersion2, primaryVersion); ClassicAssert.AreEqual(primaryVersion, replicaTwoVersion); - ClassicAssert.AreEqual(2, replicaOneVersion); + ClassicAssert.AreEqual(expectedVersion1, replicaOneVersion); // Re-attach first replica _ = context.clusterTestUtils.ClusterReplicate(replicaNodeIndex: replicaOneIndex, primaryNodeIndex: primaryIndex, logger: context.logger); @@ -271,7 +274,8 @@ public void ClusterDBVersionAlignmentDisklessSync([Values] bool disableObjects, primaryVersion = context.clusterTestUtils.GetStoreCurrentVersion(primaryIndex, isMainStore: true, logger: context.logger); replicaOneVersion = context.clusterTestUtils.GetStoreCurrentVersion(replicaOneIndex, isMainStore: true, logger: context.logger); replicaTwoVersion = context.clusterTestUtils.GetStoreCurrentVersion(replicaTwoIndex, isMainStore: true, logger: context.logger); - ClassicAssert.AreEqual(4, primaryVersion); + var expectedVersion3 = disableObjects ? 4 : 7; + ClassicAssert.AreEqual(expectedVersion3, primaryVersion); ClassicAssert.AreEqual(primaryVersion, replicaOneVersion); ClassicAssert.AreEqual(primaryVersion, replicaTwoVersion); }