diff options
author | mrbandrews <bandrewsny@gmail.com> | 2016-11-15 15:37:46 -0500 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2016-11-19 23:20:14 +0100 |
commit | 3107280e14f7ca63c693937aac490794ae746a09 (patch) | |
tree | 99cec293ac513c74bb7cebb2e99d4b4b9e301bd5 /qa/rpc-tests/test_framework | |
parent | 9460771a60e28b42cd21ac38710dd9ee7f57cc71 (diff) | |
download | bitcoin-3107280e14f7ca63c693937aac490794ae746a09.tar.xz |
[qa] add assert_raises_message to check specific error message
Github-Pull: #9168
Rebased-From: 307acdd3df03082295ac0f7fe9eba7dd35973bc4
Diffstat (limited to 'qa/rpc-tests/test_framework')
-rw-r--r-- | qa/rpc-tests/test_framework/util.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 47cebf4f6e..c5f270591e 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -508,10 +508,14 @@ def assert_greater_than(thing1, thing2): raise AssertionError("%s <= %s"%(str(thing1),str(thing2))) def assert_raises(exc, fun, *args, **kwds): + assert_raises_message(exc, None, fun, *args, **kwds) + +def assert_raises_message(exc, message, fun, *args, **kwds): try: fun(*args, **kwds) - except exc: - pass + except exc as e: + if message is not None and message not in e.error['message']: + raise AssertionError("Expected substring not found:"+e.error['message']) except Exception as e: raise AssertionError("Unexpected exception raised: "+type(e).__name__) else: |