Fix cuckoocache_tests TSAN failure introduced in #14935. Fixes #14967.

practicalswift · practicalswift · commit d98a29ec4085 · 2018-12-15T16:14:36.000+01:00
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
@@ -355,7 +355,8 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_FrozenCleanup)
         // would get called twice).
         vChecks[0].should_freeze = true;
         control.Add(vChecks);
-        BOOST_CHECK(control.Wait()); // Hangs here
+        bool waitResult = control.Wait(); // Hangs here
+        assert(waitResult);
     });
     {
         std::unique_lock<std::mutex> l(FrozenCleanupCheck::m);
diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp
@@ -220,8 +220,10 @@ static void test_cache_erase_parallel(size_t megabytes)
             size_t ntodo = (n_insert/4)/3;
             size_t start = ntodo*x;
             size_t end = ntodo*(x+1);
-            for (uint32_t i = start; i < end; ++i)
-                BOOST_CHECK(set.contains(hashes[i], true));
+            for (uint32_t i = start; i < end; ++i) {
+                bool contains = set.contains(hashes[i], true);
+                assert(contains);
+            }
         });
 
     /** Wait for all threads to finish
