Merge CBL 3.3.0 Tests #270
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove mbed TLS server logs, remove all debug TS logs, make log level display properly in remote logger Rework multipeer replicator status in Android Only react to what we get from the status updates. Remove STOPPED after sending it once so that disconnected peers don't cause false detection in tests. Bump to Java 11 compatibility mode since Java 8 is deprecated. Implement merge-dict resolver in Android Fix bug in Android getMultipeerReplStatus PeerID is not directly serializable, needs to be converted to string first Adjust for 3.3.0-53 API changes Create a multipeer dev_e2e pipeline (#240) * Make a proper name for anonymous certificates Otherwise there is a needless bottleneck in dns-sd trying to de-duplicate everything. Now it will be "Test Server #" The algorithm for calculating the folder name in http logs was wildly incorrect, and so every 100 logs would roll over to the same log files. Also the test server was using iOS 16 specific API. Remove no longer accurate or needed dev e2e test * Add a Jenkins pipeline for dev functional testing * Tweak Android display to force IPv4 address * Remove replicator status of the disconnected peers (#236) Remove replicator status of the disconnected peers so their replicator status will not be included next time. * Rework multipeer replicator status in Android Only react to what we get from the status updates. Remove STOPPED after sending it once so that disconnected peers don't cause false detection in tests. Bump to Java 11 compatibility mode since Java 8 is deprecated. * Fix an error in http log folder naming * Fix bug in Android getMultipeerReplStatus PeerID is not directly serializable, needs to be converted to string first * Adjust for 3.3.0-53 API changes * Fix an issue saving iOS PID from multiple devices Also mypy and ruff fixes --------- Co-authored-by: Pasin Suriyentrakorn <pasin@couchbase.com> CBL-7192: Don't reject a payload because of unknown keys (#241) This means that any addition in the spec will be invalid until handled properly, which causes dev friction Fix errors present in Jenkinsfile (#242) * Put all locks in a single lock statement * Make CBL_BUILD optional to prepare for its removal Fix flaw in Android merge-dict conflict resolver It was setting "docProp" on the resulting dictionary instead of "key" Update verify_python.sh Add explicit package bases to tests folder for validation Use full path in import to account for new setting
* Added merge-dict conflict resolver spec. * Bump API spec version to 2.0.1. * Implemented merge-dict resolver in iOS. Update iOS TestServer to log to console synchronously
Redocly preview |
borrrden
reviewed
Oct 14, 2025
borrrden
approved these changes
Oct 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds test coverage for multipeer functionality over Wi-Fi, as part of the CBL 3.3.0 release. It includes new test cases, helper functions, topology files, and setup scripts.
Features added :-
Added 9 test cases to cover multipeer scenarios over Wi-Fi (in test_multipeer.py and test_multipeer_system.py).
Created helper functions to support testing different scenarios and reduce code duplication (in couchbaseserver.py and json_generator.py).
Added topology files to define the test network setup (all files preceding with topology).
Included setup and orchestration scripts to configure and run components required for testing (all files in jenkins/pipelines/QE/multiplatform/ directory).
Code from dev team to modify existing test server to include merge-dict conflict resolution testing and additional logging (in servers/ directory).