mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-29 02:11:24 +02:00
tests: Provide more helpful assert_equal errors
In the functional tests, we often compare dicts with assert_equal, but the output makes it very hard to tell exactly which entry in the dicts don't match when there are a lot of entries and only minor differences. Change the output to make it clearer.
This commit is contained in:
@ -52,7 +52,24 @@ def assert_fee_amount(fee, tx_size, feerate_BTC_kvB):
|
|||||||
raise AssertionError("Fee of %s BTC too high! (Should be %s BTC)" % (str(fee), str(target_fee)))
|
raise AssertionError("Fee of %s BTC too high! (Should be %s BTC)" % (str(fee), str(target_fee)))
|
||||||
|
|
||||||
|
|
||||||
|
def summarise_dict_differences(thing1, thing2):
|
||||||
|
if not isinstance(thing1, dict) or not isinstance(thing2, dict):
|
||||||
|
return thing1, thing2
|
||||||
|
d1, d2 = {}, {}
|
||||||
|
for k in sorted(thing1.keys()):
|
||||||
|
if k not in thing2:
|
||||||
|
d1[k] = thing1[k]
|
||||||
|
elif thing1[k] != thing2[k]:
|
||||||
|
d1[k], d2[k] = summarise_dict_differences(thing1[k], thing2[k])
|
||||||
|
for k in sorted(thing2.keys()):
|
||||||
|
if k not in thing1:
|
||||||
|
d2[k] = thing2[k]
|
||||||
|
return d1, d2
|
||||||
|
|
||||||
def assert_equal(thing1, thing2, *args):
|
def assert_equal(thing1, thing2, *args):
|
||||||
|
if thing1 != thing2 and not args and isinstance(thing1, dict) and isinstance(thing2, dict):
|
||||||
|
d1,d2 = summarise_dict_differences(thing1, thing2)
|
||||||
|
raise AssertionError("not(%s == %s)\n in particular not(%s == %s)" % (thing1, thing2, d1, d2))
|
||||||
if thing1 != thing2 or any(thing1 != arg for arg in args):
|
if thing1 != thing2 or any(thing1 != arg for arg in args):
|
||||||
raise AssertionError("not(%s)" % " == ".join(str(arg) for arg in (thing1, thing2) + args))
|
raise AssertionError("not(%s)" % " == ".join(str(arg) for arg in (thing1, thing2) + args))
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user