Skip to content

Commit 299f17a

Browse files
committed
Merge bitcoin/bitcoin#28036: test: Restore unlimited timeout in IndexWaitSynced
fabed7e test: Restore unlimited timeout in IndexWaitSynced (MarcoFalke) Pull request description: The timeout was unlimited before, so just restore that value for now: bitcoin/bitcoin#27988 (comment) . (Strictly speaking, this is a behavior change for the blockfilterindex and txindex tests, because it only restores the coinstatsindex behavior.) ACKs for top commit: ajtowns: utACK fabed7e mzumsande: ACK fabed7e furszy: ACK fabed7e Tree-SHA512: 66a878be58bbe53ad8e0c23f05569dd42df688be747551fbd202ada22d20a8285714e58fa2a71664deadb070ddf86cfad88c01042ff95ed26f6b40e4a10cec0a
2 parents 334f45f + fabed7e commit 299f17a

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/test/util/index.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@
55
#include <test/util/index.h>
66

77
#include <index/base.h>
8-
#include <util/check.h>
98
#include <util/time.h>
109

11-
void IndexWaitSynced(BaseIndex& index)
10+
void IndexWaitSynced(const BaseIndex& index)
1211
{
13-
const auto timeout{SteadyClock::now() + 120s};
1412
while (!index.BlockUntilSyncedToCurrentChain()) {
15-
Assert(timeout > SteadyClock::now());
1613
UninterruptibleSleep(100ms);
1714
}
1815
}

src/test/util/index.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
class BaseIndex;
99

1010
/** Block until the index is synced to the current chain */
11-
void IndexWaitSynced(BaseIndex& index);
11+
void IndexWaitSynced(const BaseIndex& index);
1212

1313
#endif // BITCOIN_TEST_UTIL_INDEX_H

0 commit comments

Comments
 (0)