commit 1d6e0e668c0e62d8d7a98e553e421dec514c2b6f
author Steven Moreland <smoreland@google.com> Wed Aug 02 22:37:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 22:37:29 2017 +0000
tree 1b1182d9e6d9515653d038056d6fe8260fbef080
parent 9ce2b882d6f708a815bc66397a686568b486a746
parent 9de3ed09b69b150545e0fe342575cb565653c927

Merge "libhidl_test: remove flake"
am: 9de3ed09b6

Change-Id: I96d33e845e9c0470b65f8573aec2224c4a23dc4e

test_main.cpp

diff --git a/test_main.cpp b/test_main.cpp
index 1f2f845..b265607 100644
--- a/test_main.cpp
+++ b/test_main.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "LibHidlTest"
 
 #include <android-base/logging.h>
+#include <condition_variable>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <hidl/HidlSupport.h>
@@ -296,16 +297,23 @@
 
 TEST_F(LibHidlTest, TaskRunnerTest) {
     using android::hardware::details::TaskRunner;
+    using namespace std::chrono_literals;
+
+    std::condition_variable cv;
+    std::mutex m;
+
     TaskRunner tr;
     tr.start(1 /* limit */);
     bool flag = false;
     tr.push([&] {
-        usleep(1000);
         flag = true;
+        cv.notify_all();
     });
-    usleep(500);
-    EXPECT_FALSE(flag);
-    usleep(1000);
+
+    std::unique_lock<std::mutex> lock(m);
+
+    // 1s so this doesn't deadlock. This isn't a performance test.
+    EXPECT_TRUE(cv.wait_for(lock, 1s, [&]{return flag;}));
     EXPECT_TRUE(flag);
 }