zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
teor 2022-03-08 12:46:03 +10:00 committed by GitHub
parent d86896b841
commit 886a4f585b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zebrad/tests/acceptance.rs
View File

@ -1694,10 +1694,11 @@ fn lightwalletd_integration() -> Result<()> {
lightwalletd.expect_stdout_line_matches("Method not found.*error zcashd getblock rpc"); lightwalletd.expect_stdout_line_matches("Method not found.*error zcashd getblock rpc");
let (_, zebrad) = zebrad.kill_on_error(result)?; let (_, zebrad) = zebrad.kill_on_error(result)?;
// zcash/lightwalletd exits with a fatal error here, but // zcash/lightwalletd exits with a fatal error here.
// adityapk00/lightwalletd keeps trying the mempool // adityapk00/lightwalletd keeps trying the mempool,
// but it sometimes skips the "Method not found" log line.
let result = 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)?; let (_, zebrad) = zebrad.kill_on_error(result)?;
// Cleanup both processes // Cleanup both processes