From ed4c853d14aec07bdaa119130739aeb499785ac2 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@google.com>
Date: Fri, 28 Apr 2023 14:53:06 -0700
Subject: [PATCH] libsnapshot: Disable another legacy merge path in tests.

Bug: 279009697
Test: presubmit
Change-Id: I1954b38f497bb8e4f7aa288e80541ac9ad5c075c
---
 fs_mgr/libsnapshot/snapshot_test.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp
index f472babdf..1fbfaf750 100644
--- a/fs_mgr/libsnapshot/snapshot_test.cpp
+++ b/fs_mgr/libsnapshot/snapshot_test.cpp
@@ -2646,6 +2646,11 @@ TEST_F(SnapshotUpdateTest, QueryStatusError) {
     ASSERT_TRUE(init->InitiateMerge());
     ASSERT_EQ(UpdateState::MergeFailed, init->ProcessUpdateState());
 
+    if (ShouldSkipLegacyMerging()) {
+        LOG(INFO) << "Skipping legacy merge in test";
+        return;
+    }
+
     // Simulate a reboot that tries the merge again, with the non-failing dm.
     ASSERT_TRUE(UnmapAll());
     init = NewManagerForFirstStageMount("_b");