Commit b9d7a6d4 authored by Ryo Hashimoto's avatar Ryo Hashimoto Committed by Commit Bot

arc: Start arc-host-clock-service for ARCVM

BUG=b:166087457
TEST=Login

Change-Id: Ic135bf97543c755686fe40ad7219cd02aaa8f9bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2392187Reviewed-by: default avatarYusuke Sato <yusukes@chromium.org>
Commit-Queue: Ryo Hashimoto <hashimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805617}
parent 6731dc06
...@@ -59,6 +59,8 @@ namespace { ...@@ -59,6 +59,8 @@ namespace {
// that aren't valid in D-Bus object paths with underscore followed by its // that aren't valid in D-Bus object paths with underscore followed by its
// ascii code in hex. So "arc_2dcreate_2ddata" becomes "arc-create-data". // ascii code in hex. So "arc_2dcreate_2ddata" becomes "arc-create-data".
constexpr const char kArcCreateDataJobName[] = "arc_2dcreate_2ddata"; constexpr const char kArcCreateDataJobName[] = "arc_2dcreate_2ddata";
constexpr const char kArcHostClockServiceJobName[] =
"arc_2dhost_2dclock_2dservice";
constexpr const char kArcKeymasterJobName[] = "arc_2dkeymasterd"; constexpr const char kArcKeymasterJobName[] = "arc_2dkeymasterd";
constexpr const char kArcSensorServiceJobName[] = "arc_2dsensor_2dservice"; constexpr const char kArcSensorServiceJobName[] = "arc_2dsensor_2dservice";
constexpr const char kArcVmMountMyFilesJobName[] = "arcvm_2dmount_2dmyfiles"; constexpr const char kArcVmMountMyFilesJobName[] = "arcvm_2dmount_2dmyfiles";
...@@ -604,6 +606,9 @@ class ArcVmClientAdapter : public ArcClientAdapter, ...@@ -604,6 +606,9 @@ class ArcVmClientAdapter : public ArcClientAdapter,
JobDesc{kArcKeymasterJobName, UpstartOperation::JOB_STOP_AND_START, {}}, JobDesc{kArcKeymasterJobName, UpstartOperation::JOB_STOP_AND_START, {}},
JobDesc{ JobDesc{
kArcSensorServiceJobName, UpstartOperation::JOB_STOP_AND_START, {}}, kArcSensorServiceJobName, UpstartOperation::JOB_STOP_AND_START, {}},
JobDesc{kArcHostClockServiceJobName,
UpstartOperation::JOB_STOP_AND_START,
{}},
JobDesc{kArcVmBootNotificationServerJobName, JobDesc{kArcVmBootNotificationServerJobName,
UpstartOperation::JOB_STOP_AND_START, UpstartOperation::JOB_STOP_AND_START,
{}}, {}},
......
...@@ -43,6 +43,8 @@ namespace arc { ...@@ -43,6 +43,8 @@ namespace arc {
namespace { namespace {
constexpr const char kArcCreateDataJobName[] = "arc_2dcreate_2ddata"; constexpr const char kArcCreateDataJobName[] = "arc_2dcreate_2ddata";
constexpr const char kArcHostClockServiceJobName[] =
"arc_2dhost_2dclock_2dservice";
constexpr const char kArcKeymasterJobName[] = "arc_2dkeymasterd"; constexpr const char kArcKeymasterJobName[] = "arc_2dkeymasterd";
constexpr const char kArcSensorServiceJobName[] = "arc_2dsensor_2dservice"; constexpr const char kArcSensorServiceJobName[] = "arc_2dsensor_2dservice";
constexpr const char kArcVmMountMyFilesJobName[] = "arcvm_2dmount_2dmyfiles"; constexpr const char kArcVmMountMyFilesJobName[] = "arcvm_2dmount_2dmyfiles";
...@@ -531,6 +533,28 @@ TEST_F(ArcVmClientAdapterTest, StartMiniArc_StopArcVmServerProxyJobFail) { ...@@ -531,6 +533,28 @@ TEST_F(ArcVmClientAdapterTest, StartMiniArc_StopArcVmServerProxyJobFail) {
// for other StartMiniArc_...Fail tests. // for other StartMiniArc_...Fail tests.
} }
// Tests that StartMiniArc() fails if Upstart fails to start
// arc-host-clock-service.
TEST_F(ArcVmClientAdapterTest, StartMiniArc_StartArcHostClockServiceJobFail) {
// Inject failure to FakeUpstartClient.
InjectUpstartStartJobFailure(kArcHostClockServiceJobName);
StartMiniArcWithParams(false, {});
// Confirm that no VM is started. ARCVM doesn't support mini ARC yet.
EXPECT_FALSE(GetTestConciergeClient()->start_arc_vm_called());
}
// Tests that StartMiniArc() succeeds if Upstart fails to stop
// arc-host-clock-service.
TEST_F(ArcVmClientAdapterTest, StartMiniArc_StopArcHostClockServiceJobFail) {
// Inject failure to FakeUpstartClient.
InjectUpstartStopJobFailure(kArcHostClockServiceJobName);
StartMiniArc();
// Confirm that no VM is started. ARCVM doesn't support mini ARC yet.
EXPECT_FALSE(GetTestConciergeClient()->start_arc_vm_called());
}
// Tests that StartMiniArc() fails if Upstart fails to start arc-keymasterd. // Tests that StartMiniArc() fails if Upstart fails to start arc-keymasterd.
TEST_F(ArcVmClientAdapterTest, StartMiniArc_StartArcKeymasterJobFail) { TEST_F(ArcVmClientAdapterTest, StartMiniArc_StartArcKeymasterJobFail) {
// Inject failure to FakeUpstartClient. // Inject failure to FakeUpstartClient.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment