Merge of #3758

ZcashFoundation · Mar 7, 2022 · ae47742 · ae47742
2 parents d718f1d + 203bfdc
commit ae47742
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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