Merge "Disable flaky tests" into qt-dev am: 30a25acb83

am: 64bb45ad2a

Change-Id: I4523099930a8f5a105882fb2049266b75650770f

1 files changed, 7 insertions, 3 deletions

diff --git a/libs/hwui/tests/unit/CommonPoolTests.cpp b/libs/hwui/tests/unit/CommonPoolTests.cpp
index 70a5f5acbb6e..da6a2604a4b6 100644
--- a/libs/hwui/tests/unit/CommonPoolTests.cpp
+++ b/libs/hwui/tests/unit/CommonPoolTests.cpp
@@ -36,7 +36,9 @@ TEST(CommonPool, post) {
     EXPECT_TRUE(ran) << "Failed to flip atomic after 1 second";
 }
 
-TEST(CommonPool, threadCount) {
+// test currently relies on timings, which
+// makes it flaky. Disable for now
+TEST(DISABLED_CommonPool, threadCount) {
     std::set<pid_t> threads;
     std::array<std::future<pid_t>, 64> futures;
     for (int i = 0; i < futures.size(); i++) {
@@ -93,7 +95,9 @@ TEST(CommonPool, singleThread) {
     EXPECT_NE(gettid(), tid1);
 }
 
-TEST(CommonPool, fullQueue) {
+// Test currently relies on timings
+// which makes it flaky, disable for now
+TEST(DISABLED_CommonPool, fullQueue) {
     std::mutex lock;
     std::condition_variable fence;
     bool signaled = false;
@@ -179,4 +183,4 @@ TEST(CommonPool, syncLifecycleCheck) {
     }
     CommonPool::waitForIdle();
     ASSERT_EQ(0, ObjectTracker::count());
-}
\ No newline at end of file
+}