diff options
author | Tao Bao <tbao@google.com> | 2019-04-24 22:56:24 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-24 22:56:24 +0200 |
commit | 24eb4d1cdd478ba1c78dcc27bdf06f1676c18af5 (patch) | |
tree | 19fb579b34c6315a136a021a2c4bca608b9ae9df /minadbd/minadbd_services_test.cpp | |
parent | Merge "Add test for minadbd" am: c92f412b8d (diff) | |
parent | Merge "minadbd: Support `adb reboot` under sideload/rescue modes." (diff) | |
download | android_bootable_recovery-24eb4d1cdd478ba1c78dcc27bdf06f1676c18af5.tar android_bootable_recovery-24eb4d1cdd478ba1c78dcc27bdf06f1676c18af5.tar.gz android_bootable_recovery-24eb4d1cdd478ba1c78dcc27bdf06f1676c18af5.tar.bz2 android_bootable_recovery-24eb4d1cdd478ba1c78dcc27bdf06f1676c18af5.tar.lz android_bootable_recovery-24eb4d1cdd478ba1c78dcc27bdf06f1676c18af5.tar.xz android_bootable_recovery-24eb4d1cdd478ba1c78dcc27bdf06f1676c18af5.tar.zst android_bootable_recovery-24eb4d1cdd478ba1c78dcc27bdf06f1676c18af5.zip |
Diffstat (limited to 'minadbd/minadbd_services_test.cpp')
-rw-r--r-- | minadbd/minadbd_services_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/minadbd/minadbd_services_test.cpp b/minadbd/minadbd_services_test.cpp index 413ba0df6..593180bb3 100644 --- a/minadbd/minadbd_services_test.cpp +++ b/minadbd/minadbd_services_test.cpp @@ -62,7 +62,7 @@ class MinadbdServicesTest : public ::testing::Test { signal(SIGPIPE, SIG_DFL); } - void ReadAndCheckCommandMessage(int fd, MinadbdCommands expected_command) { + void ReadAndCheckCommandMessage(int fd, MinadbdCommand expected_command) { std::vector<uint8_t> received(kMinadbdMessageSize, '\0'); ASSERT_TRUE(android::base::ReadFully(fd, received.data(), kMinadbdMessageSize)); @@ -147,7 +147,7 @@ TEST_F(MinadbdServicesTest, SideloadHostService_wrong_command_format) { unique_fd fd = daemon_service_to_fd(command, nullptr); ASSERT_NE(-1, fd); WaitForFusePath(); - ReadAndCheckCommandMessage(recovery_socket_, MinadbdCommands::kInstall); + ReadAndCheckCommandMessage(recovery_socket_, MinadbdCommand::kInstall); struct stat sb; ASSERT_EQ(0, stat(exit_flag_.c_str(), &sb)); @@ -188,7 +188,7 @@ TEST_F(MinadbdServicesTest, SideloadHostService_read_data_from_fuse) { unique_fd fd = daemon_service_to_fd("sideload-host:4096:4096", nullptr); ASSERT_NE(-1, fd); - ReadAndCheckCommandMessage(recovery_socket_, MinadbdCommands::kInstall); + ReadAndCheckCommandMessage(recovery_socket_, MinadbdCommand::kInstall); // Mimic the response from adb host. std::string adb_message(8, '\0'); |