diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-04-27 10:52:17 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-04-27 10:53:09 +0200 |
| commit | 5c7df7022bcd360e6af00b9458b1a3fd54e1cc9a (patch) | |
| tree | 0647c7dda8160dd7c3b3cf7eaebd594be744c5a0 | |
| parent | e26b62093ae21e89ed7d36a24a6b863f38ec631d (diff) | |
| parent | fada064f67302502f6b51d9d22927381c2707cbb (diff) | |
| download | bitcoin-5c7df7022bcd360e6af00b9458b1a3fd54e1cc9a.tar.xz | |
Merge #7951: [qa] test_framework: Properly print exception
fada064 [qa] test_framework: Properly print exceptions and assert empty dict (MarcoFalke)
5555528 [qa] mininode: Unfiddle strings into bytes (MarcoFalke)
| -rwxr-xr-x | qa/rpc-tests/test_framework/mininode.py | 8 | ||||
| -rwxr-xr-x | qa/rpc-tests/test_framework/test_framework.py | 2 | ||||
| -rw-r--r-- | qa/rpc-tests/test_framework/util.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index af33564114..30aecfd445 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -93,7 +93,7 @@ def deser_uint256(f): def ser_uint256(u): - rs = "" + rs = b"" for i in xrange(8): rs += struct.pack("<I", u & 0xFFFFFFFFL) u >>= 32 @@ -191,7 +191,7 @@ def deser_string_vector(f): def ser_string_vector(l): - r = "" + r = b"" if len(l) < 253: r = struct.pack("B", len(l)) elif len(l) < 0x10000: @@ -624,7 +624,7 @@ class CAlert(object): self.vchSig = deser_string(f) def serialize(self): - r = "" + r = b"" r += ser_string(self.vchMsg) r += ser_string(self.vchSig) return r @@ -988,7 +988,7 @@ class msg_reject(object): def __init__(self): self.message = b"" self.code = 0 - self.reason = "" + self.reason = b"" self.data = 0L def deserialize(self, f): diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py index 3b08cd1384..18ecf64b06 100755 --- a/qa/rpc-tests/test_framework/test_framework.py +++ b/qa/rpc-tests/test_framework/test_framework.py @@ -146,7 +146,7 @@ class BitcoinTestFramework(object): print("key not found: "+ str(e)) traceback.print_tb(sys.exc_info()[2]) except Exception as e: - print("Unexpected exception caught during testing: "+str(e)) + print("Unexpected exception caught during testing: " + repr(e)) traceback.print_tb(sys.exc_info()[2]) if not self.options.noshutdown: diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 27891f7f4c..baa1ed6790 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -487,7 +487,7 @@ def assert_array_result(object_array, to_match, expected, should_not_find = Fals in object_array """ if should_not_find == True: - expected = { } + assert_equal(expected, { }) num_matched = 0 for item in object_array: all_match = True |