Skip to content

Update test comment description #7826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update test comment description #7826

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions rest/replicatortest/replicator_test_legacy_rev_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Copy link
Contributor

@gregns1 gregns1 Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think here we need to swap the sources for SGW1 and SGW2 given for this test case we update the doc on active peer (SGW1) on line 1005. So I think this needs to be 1100@SGW1;2def@RTE,oldcas@SGW2

// +-----------------+-------------+-------------------------------+-------------+--------------------------------+
{
name: "passive peer has post upgrade version that wins",
activePeerHasPostUpgradeVersion: false,
Expand Down