commit ed25450792bae54c0ffeeb1b094983cd6f5e0ef4
author Daniel Zheng <zhengdaniel@google.com> Thu Jul 25 04:23:03 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 25 04:23:03 2024 +0000
tree 345d019cc9f203d0efa962ab2b7a9026133b083e
parent 11f08531f964e9cfad103e36963c37946d9c149b
parent 39fe6e1d384b0730161d6b545199dfb10110de58

Merge "libsnapshot: add test for merge_size param" into main

fs_mgr/libsnapshot/snapshot_test.cpp

diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp
index 07f1301..b2e36d4 100644
--- a/fs_mgr/libsnapshot/snapshot_test.cpp
+++ b/fs_mgr/libsnapshot/snapshot_test.cpp
@@ -2665,6 +2665,7 @@
     status.set_o_direct(true);
     status.set_io_uring_enabled(true);
     status.set_userspace_snapshots(true);
+    status.set_cow_op_merge_size(16);
 
     sm->WriteSnapshotUpdateStatus(lock_.get(), status);
     // Ensure a connection to the second-stage daemon, but use the first-stage
@@ -2686,6 +2687,8 @@
                 snapuserd_argv.end());
     ASSERT_TRUE(std::find(snapuserd_argv.begin(), snapuserd_argv.end(), "-user_snapshot") !=
                 snapuserd_argv.end());
+    ASSERT_TRUE(std::find(snapuserd_argv.begin(), snapuserd_argv.end(), "-cow_op_merge_size=16") !=
+                snapuserd_argv.end());
 }
 
 class FlashAfterUpdateTest : public SnapshotUpdateTest,