Skip to content

Added 2 tests related to multi Client - single SG replication#325

Merged
vipbhardwaj merged 2 commits intomainfrom
sgw-replication-tests
Dec 3, 2025
Merged

Added 2 tests related to multi Client - single SG replication#325
vipbhardwaj merged 2 commits intomainfrom
sgw-replication-tests

Conversation

@vipbhardwaj
Copy link
Contributor

These tests come from this specific file and line, and the test below this.
Now I have not added nothing new in the client/sec/cbltest/api directory files, nor have I done anything else in other files.

This is just a plain and simple addition in spec/tests/QE and tests/QE dir.
I've only just used the functions in main, since I have branched off main to this current branch. Hence it can safely be merged to main.

…ng the tests from old kit had the same issue
@vipbhardwaj vipbhardwaj requested a review from borrrden December 2, 2025 05:55
@vipbhardwaj
Copy link
Contributor Author

Thank you for the thorough review @RIT3shSapata and @borrrden , the more the PR backlog thins out, the lesser the divergence would be of syncgateway.py amongst all pending PRs and main. Since I always rebase main onto a BACKLOG branch which needs main's (global) code to be in sync and needs its own local code to help the tests work.

I think the issue we are seeing related to the PR's local file version having a diff from main is just positional, as to why, because at say line 'X' has some code globally, ie, in main, before I rebase, the local version of it has some new function at line 'X' since I add it manually.

  • Some PR then gets merged, hence main has a different code at 'X' line vs the pending PR still.
  • Then when I rebase, line 'X's code is decided mostly by the rebase-er logic by git so I am not sure as to why is a certain line not matching in a certain PR.
    If I am misunderstanding this and you actually meant something else, @borrrden , we can discuss this further, maybe there's another way to rebase than what I've been doing.
    I've left "pull+merge" long back since it brings in a history of commits and file changes that I never did in a PR.
    Maybe I need to read on rebase a bit more too as-to-how to do a rebase such that for every line 'X' the code local == code global on that line? 🤔

@vipbhardwaj vipbhardwaj merged commit 7d270f1 into main Dec 3, 2025
4 checks passed
@vipbhardwaj vipbhardwaj deleted the sgw-replication-tests branch December 3, 2025 04:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants