diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-04-25 14:53:14 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-04-25 14:59:52 +0200 |
| commit | 89ae85484c8b8eb6400cdaa84461c369854f6667 (patch) | |
| tree | 3ab677abae84c5ffb03d5588abca58ae70476c85 /src | |
| parent | 9779e1e1f320a45255f2e81325f2feceec3fa944 (diff) | |
| parent | 6862627ce6bc04e68801f026629932987c3ab424 (diff) | |
| download | bitcoin-89ae85484c8b8eb6400cdaa84461c369854f6667.tar.xz | |
Merge #7811: [0.12.2] qa Backports
6862627 Add listunspent() test for spendable/unspendable UTXO (Joao Fonseca)
28ba22c [qa] Remove misleading "errorString syntax" (MarcoFalke)
f1f1b82 [qa] py2: Unfiddle strings into bytes explicitly (MarcoFalke)
c0d9e31 Tests: make prioritise_transaction.py more robust (Suhas Daftuar)
ff9b436 [qa] Bug fixes and refactor (MarcoFalke)
b1dd64b [qa] wallet: Wait for reindex to catch up (MarcoFalke)
f23cb7c [qa] Add tests verifychain, lockunspent, getbalance, listsinceblock (MarcoFalke)
3316552 [qa] Test walletpassphrase timeout (MarcoFalke)
6aae129 [qa] wallet: Print maintenance (MarcoFalke)
ad8c743 [qa] Extend tests (MarcoFalke)
d89fbfe [qa] rpc-test: Normalize assert() (MarcoFalke)
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/bctest.py | 1 | ||||
| -rw-r--r-- | src/test/util_tests.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/test/bctest.py b/src/test/bctest.py index 3a8d0ea51b..ae958cfe38 100644 --- a/src/test/bctest.py +++ b/src/test/bctest.py @@ -2,6 +2,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. +from __future__ import division,print_function,unicode_literals import subprocess import os import json diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 28cecfffaf..517e6945cf 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -196,6 +196,8 @@ BOOST_AUTO_TEST_CASE(util_ParseMoney) BOOST_CHECK_EQUAL(ret, COIN*10); BOOST_CHECK(ParseMoney("1.00", ret)); BOOST_CHECK_EQUAL(ret, COIN); + BOOST_CHECK(ParseMoney("1", ret)); + BOOST_CHECK_EQUAL(ret, COIN); BOOST_CHECK(ParseMoney("0.1", ret)); BOOST_CHECK_EQUAL(ret, COIN/10); BOOST_CHECK(ParseMoney("0.01", ret)); @@ -215,6 +217,9 @@ BOOST_AUTO_TEST_CASE(util_ParseMoney) // Attempted 63 bit overflow should fail BOOST_CHECK(!ParseMoney("92233720368.54775808", ret)); + + // Parsing negative amounts must fail + BOOST_CHECK(!ParseMoney("-1", ret)); } BOOST_AUTO_TEST_CASE(util_IsHex) |