mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-04-29 06:49:38 -04:00
test: Add missing check for empty stderr in util tester
This commit is contained in:
parent
96a5cd8000
commit
fadf12a56c
1 changed files with 8 additions and 7 deletions
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
# Copyright 2014 BitPay Inc.
|
# Copyright 2014 BitPay Inc.
|
||||||
# Copyright 2016-2017 The Bitcoin Core developers
|
# Copyright 2016-present The Bitcoin Core developers
|
||||||
# Distributed under the MIT software license, see the accompanying
|
# Distributed under the MIT software license, see the accompanying
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
"""Test framework for bitcoin utils.
|
"""Test framework for bitcoin utils.
|
||||||
|
@ -155,15 +155,16 @@ def bctest(testDir, testObj, buildenv):
|
||||||
|
|
||||||
if "error_txt" in testObj:
|
if "error_txt" in testObj:
|
||||||
want_error = testObj["error_txt"]
|
want_error = testObj["error_txt"]
|
||||||
# Compare error text
|
# A partial match instead of an exact match makes writing tests easier
|
||||||
# TODO: ideally, we'd compare the strings exactly and also assert
|
# and should be sufficient.
|
||||||
# That stderr is empty if no errors are expected. However, bitcoin-tx
|
|
||||||
# emits DISPLAY errors when running as a windows application on
|
|
||||||
# linux through wine. Just assert that the expected error text appears
|
|
||||||
# somewhere in stderr.
|
|
||||||
if want_error not in res.stderr:
|
if want_error not in res.stderr:
|
||||||
logging.error(f"Error mismatch:\nExpected: {want_error}\nReceived: {res.stderr.rstrip()}\nres: {str(res)}")
|
logging.error(f"Error mismatch:\nExpected: {want_error}\nReceived: {res.stderr.rstrip()}\nres: {str(res)}")
|
||||||
raise Exception
|
raise Exception
|
||||||
|
else:
|
||||||
|
if res.stderr:
|
||||||
|
logging.error(f"Unexpected error received: {res.stderr.rstrip()}\nres: {str(res)}")
|
||||||
|
raise Exception
|
||||||
|
|
||||||
|
|
||||||
def parse_output(a, fmt):
|
def parse_output(a, fmt):
|
||||||
"""Parse the output according to specified format.
|
"""Parse the output according to specified format.
|
||||||
|
|
Loading…
Add table
Reference in a new issue