commit 5b1d015864cb4333a30e56d1c3871a19ec6b9677
author Jae Hoon Kim <kimjae@chromium.org> Mon Aug 03 11:23:44 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Aug 04 13:51:22 2020 +0000
tree d721ff336e7c45a1b71d0bd8e817996ab24841f1
parent 410ce4f4ed616ac58e433ac854d1da9d37b2786b

dlcservice: Fix |DlcStateChange()|'s signal of root path

|DlcStateChange()| was returning the |mount_point_| instead of the root
path of the DLC in |DlcState|.

BUG=none
TEST=FEATURES=test emerge-$B dlcservice dlcservice-client

Change-Id: I6b7fd027ba327f8f306e69bf64d9d34f5b64fb49
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2335546
Tested-by: Jae Hoon Kim <kimjae@chromium.org>
Auto-Submit: Jae Hoon Kim <kimjae@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Andrew Lassalle <andrewlassalle@chromium.org>
Commit-Queue: Fergus Dall <sidereal@google.com>

dlcservice/dlc.cc

diff --git a/dlcservice/dlc.cc b/dlcservice/dlc.cc
index 511a602..5cac820 100644
--- a/dlcservice/dlc.cc
+++ b/dlcservice/dlc.cc
@@ -631,7 +631,7 @@
     case DlcState::INSTALLED:
       state_.set_state(state);
       state_.set_progress(1.0);
-      state_.set_root_path(mount_point_.value());
+      state_.set_root_path(GetRoot().value());
       break;
 
     default:

dlcservice/dlc_test.cc

diff --git a/dlcservice/dlc_test.cc b/dlcservice/dlc_test.cc
index 5b40ac9..e2f6d9e 100644
--- a/dlcservice/dlc_test.cc
+++ b/dlcservice/dlc_test.cc
@@ -516,9 +516,10 @@
   dlc.Initialize();
   dlc.mount_point_ = base::FilePath("foo-path");
 
+  // The |root_path| in |DlcState| should point to the root of the mount point.
   EXPECT_CALL(mock_state_change_reporter_,
-              DlcStateChanged(
-                  CheckDlcStateProto(DlcState::INSTALLED, 1.0, "foo-path")));
+              DlcStateChanged(CheckDlcStateProto(DlcState::INSTALLED, 1.0,
+                                                 "foo-path/root")));
   dlc.ChangeState(DlcState::INSTALLED);
 }