From 083bc49149803c17fcf98188d591f2dc5efb51ba Mon Sep 17 00:00:00 2001 From: Tor Colvin Date: Wed, 15 Oct 2025 10:27:09 -0400 Subject: [PATCH] Update comments --- .../replicator_test_legacy_rev_test.go | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/rest/replicatortest/replicator_test_legacy_rev_test.go b/rest/replicatortest/replicator_test_legacy_rev_test.go index 6947f4303d..c734562fe4 100644 --- a/rest/replicatortest/replicator_test_legacy_rev_test.go +++ b/rest/replicatortest/replicator_test_legacy_rev_test.go @@ -826,28 +826,28 @@ func TestActiveReplicatorConflictPreUpgradedVersionOneSide(t *testing.T) { name string activePeerHasPostUpgradeVersion bool }{ - // +-----------------+-------------------+----------------------------------------+-------------------+----------------------------------------+--+--+--+--+--+ - // | | SGW1 | | SGW2 | | | | | | | - // +-----------------+-------------------+----------------------------------------+-------------------+----------------------------------------+--+--+--+--+--+ - // | | Rev Tree | HLV | Rev Tree | HLV | | | | | | - // +-----------------+-------------------+----------------------------------------+-------------------+----------------------------------------+--+--+--+--+--+ - // | Initial State | 2-def,1-abc | 100@SGW1 | 2-abc,1-abc | none | | | | | | - // +-----------------+-------------------+----------------------------------------+-------------------+----------------------------------------+--+--+--+--+--+ - // | Expected Result | 3-abc,2-abc,1-abc | encodedFromRev3@Revision+Tree+Encoding | 3-abc,2-abc,1-abc | encodedFromRev3@Revision+Tree+Encoding | | | | | | - // +-----------------+-------------------+----------------------------------------+-------------------+----------------------------------------+--+--+--+--+--+ + // +-----------------+-------------------+--------------------------------------+-------------------+ + // | | SGW1 | | SGW2 | | + // +-----------------+-------------------+------------------+-------------------+-------------------+ + // | | Rev Tree | HLV | Rev Tree | HLV | + // +-----------------+-------------------+------------------+-------------------+-------------------+ + // | Initial State | 2-def,1-abc | 100@SGW1 | 2-abc,1-abc | none | + // +-----------------+-------------------+------------------+-------------------+-------------------+ + // | Expected Result | 3-abc,2-abc,1-abc | 3abc@RTE;100@SGW | 3-abc,2-abc,1-abc | 3abc@RTE;100@SGW1 | + // +-----------------+-------------------+--------------------------------------+-------------------+ { name: "active peer has post upgrade version that wins", activePeerHasPostUpgradeVersion: true, }, - // +-----------------+-------------+----------+-------------+----------+--+--+--+--+--+ - // | | SGW1 | | SGW2 | | | | | | | - // +-----------------+-------------+----------+-------------+----------+--+--+--+--+--+ - // | | Rev Tree | HLV | Rev Tree | HLV | | | | | | - // +-----------------+-------------+----------+-------------+----------+--+--+--+--+--+ - // | Initial State | 2-abc,1-abc | none | 2-def,1-abc | 100@SGW2 | | | | | | - // +-----------------+-------------+----------+-------------+----------+--+--+--+--+--+ - // | Expected Result | 2-def,1-abc | 100@SGW2 | 2-def,1-abc | 100@SGW2 | | | | | | - // +-----------------+-------------+----------+-------------+----------+--+--+--+--+--+ + // +-----------------+-------------+-------------------------------+-------------+--------------------------------+ + // | | SGW1 | | SGW2 | | + // +-----------------+-------------+-------------------------------+-------------+--------------------------------+ + // | | Rev Tree | HLV | Rev Tree | HLV | + // +-----------------+-------------+-------------------------------+-------------+--------------------------------+ + // | Initial State | 2-abc,1-abc | none | 2-def,1-abc | 100@SGW2 | + // +-----------------+-------------+-------------------------------+-------------+--------------------------------+ + // | Expected Result | 2-def,1-abc | 1100@SGW2;2def@RTE;oldcas@SGW1| 2-def,1-abc | 1100@SGW2;2def@RTE;oldcas@SGW1 | + // +-----------------+-------------+-------------------------------+-------------+--------------------------------+ { name: "passive peer has post upgrade version that wins", activePeerHasPostUpgradeVersion: false,