From 2d95f4f097a13a0132369f80412c8ea9dcfee567 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Thu, 17 Aug 2023 09:06:19 -0700 Subject: [PATCH] disk_cache: Disable the "List" test for RO disk cache. It uses a poll function that waits for a second hoping for another thread to catch up, which is not a reliable way to do synchronization. The test has been spuriously failing merges on a regular basis recently. This is issue #9222, which I'm leaving open until the author can fix the test. Fixes: 3b69b67545b6 ("util/fossilize_db: add runtime RO foz db loading via FOZ_DBS_DYNAMIC_LIST") Part-of: (cherry picked from commit 4dfd306454a4653a8c0b0a37a3e6bb1632abfc9e) --- .pick_status.json | 2 +- src/util/tests/cache_test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e2edd0af35e..c9a726fadf3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6234,7 +6234,7 @@ "description": "disk_cache: Disable the \"List\" test for RO disk cache.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3b69b67545b678da2970654b9490cc3902cdf738", "notes": null diff --git a/src/util/tests/cache_test.cpp b/src/util/tests/cache_test.cpp index 299a4dc292b..32caca86954 100644 --- a/src/util/tests/cache_test.cpp +++ b/src/util/tests/cache_test.cpp @@ -1016,7 +1016,7 @@ TEST_F(Cache, Combined) #endif } -TEST_F(Cache, List) +TEST_F(Cache, DISABLED_List) { const char *driver_id = "make_check"; char blob[] = "This is a RO blob";