From 886a4f585b7a7704b188a6a00e3a91a82791c30a Mon Sep 17 00:00:00 2001 From: teor Date: Tue, 8 Mar 2022 12:46:03 +1000 Subject: [PATCH] fix(test/lightwalletd): add an alternative matching log line (#3758) Sometimes lightwalletd goes straight to "Another refresh in progress", without logging "Mempool refresh error" first. Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- zebrad/tests/acceptance.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs index a706d42f0..95e963387 100644 --- a/zebrad/tests/acceptance.rs +++ b/zebrad/tests/acceptance.rs @@ -1694,10 +1694,11 @@ fn lightwalletd_integration() -> Result<()> { lightwalletd.expect_stdout_line_matches("Method not found.*error zcashd getblock rpc"); let (_, zebrad) = zebrad.kill_on_error(result)?; - // zcash/lightwalletd exits with a fatal error here, but - // adityapk00/lightwalletd keeps trying the mempool + // zcash/lightwalletd exits with a fatal error here. + // adityapk00/lightwalletd keeps trying the mempool, + // but it sometimes skips the "Method not found" log line. let result = - lightwalletd.expect_stdout_line_matches("Mempool refresh error: -32601: Method not found"); + lightwalletd.expect_stdout_line_matches("(Mempool refresh error: -32601: Method not found)|(Another refresh in progress, returning)"); let (_, zebrad) = zebrad.kill_on_error(result)?; // Cleanup both processes