commit 05da3b0808a75f08194966ffd9e3318e29b0a09d
author Tom Cherry <tomcherry@google.com> Tue Feb 20 23:04:33 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 20 23:04:33 2018 +0000
tree 99a6b47b5de5be22a93869b9fc5d73a0cba41061
parent a4071c55539f471bef1147d72bc7bee69f2ba299
parent a4da9c61c0b4bb5f4d4019951f758d72e161e11f

Merge "Fix intermittent crash in property_service_test"
am: ca26cbc5d3

Change-Id: Ieaa5218faf9deee0443b88fff6be43d4a0877ec9

init/property_service_test.cpp

diff --git a/init/property_service_test.cpp b/init/property_service_test.cpp
index 95dd340..c038aff 100644
--- a/init/property_service_test.cpp
+++ b/init/property_service_test.cpp
@@ -45,11 +45,13 @@
   // ...so we can send it a malformed request.
   uint32_t msg = PROP_MSG_SETPROP2;
   uint32_t size = 0xffffffff;
-  uint32_t data = 0xdeadbeef;
 
   ASSERT_EQ(static_cast<ssize_t>(sizeof(msg)), send(fd, &msg, sizeof(msg), 0));
   ASSERT_EQ(static_cast<ssize_t>(sizeof(size)), send(fd, &size, sizeof(size), 0));
-  ASSERT_EQ(static_cast<ssize_t>(sizeof(data)), send(fd, &data, sizeof(data), 0));
+  uint32_t result = 0;
+  ASSERT_EQ(static_cast<ssize_t>(sizeof(result)),
+            TEMP_FAILURE_RETRY(recv(fd, &result, sizeof(result), MSG_WAITALL)));
+  EXPECT_EQ(static_cast<uint32_t>(PROP_ERROR_READ_DATA), result);
   ASSERT_EQ(0, close(fd));
 }