diff --git a/tests/test_crypto_tools.py b/tests/test_crypto_tools.py index 191f118121be1b2265e5d1a5b2a6b2436cd0cac6..7534f891a98a3c3663aeb585b54c137a0347a211 100644 --- a/tests/test_crypto_tools.py +++ b/tests/test_crypto_tools.py @@ -49,7 +49,7 @@ def test_validate_checksum(pubkey, checksum, expected, capsys): else: with pytest.raises(SystemExit) as pytest_exit: test = crypto_tools.validate_checksum(pubkey_with_ck) - assert capsys.readouterr() == expected + assert capsys.readouterr() == expected assert pytest_exit.type == SystemExit @@ -67,7 +67,7 @@ def test_check_pubkey_format(pubkey, display_error, expected, capsys): if isinstance(expected, str): with pytest.raises(SystemExit) as pytest_exit: test = crypto_tools.check_pubkey_format(pubkey, display_error) - assert capsys.readouterr() == expected + assert capsys.readouterr() == expected assert pytest_exit.type == SystemExit else: assert expected == crypto_tools.check_pubkey_format(pubkey, display_error) diff --git a/tests/test_unit_tx.py b/tests/test_unit_tx.py index 58ce7552214104f5dda77ec8c10c16516ba82dea..57379c10f7ab981f0092d974f5f2325af62894cb 100644 --- a/tests/test_unit_tx.py +++ b/tests/test_unit_tx.py @@ -192,9 +192,9 @@ def test_compute_amounts_errors(capsys): trial[0], trial[1], ) - expected_error = "Error: amount {0} is too low.".format(trial[0][0]) - assert capsys.readouterr() == expected_error assert pytest_exit.type == SystemExit + expected_error = "Error: amount {0} is too low.".format(trial[0][0]) + assert capsys.readouterr().out == expected_error def test_compute_amounts(): @@ -1344,28 +1344,23 @@ def test_check_transaction_values_errors( result = tx.check_transaction_values( comment, outputAddresses, outputBackChange, enough_source, issuer_pubkey ) - display = capsys.readouterr() - if comment.find("Wrong_Char_") != -1: - assert display == "Error: the format of the comment is invalid" - elif len(comment) > tx.MAX_COMMENT_LENGTH: - assert display == "Error: the format of the comment is invalid" - elif "Wrong_Pubkey" in outputAddresses: - assert display.out.find("Error: bad format for following public key:") != -1 - elif outputBackChange: - if outputBackChange == "Wrong_Pubkey": - assert ( - display.out.find("Error: bad format for following public key:") - != -1 - ) - elif enough_source is True: - assert ( - display.out.find( - "pubkey doesn’t have enough money for this transaction." - ) - != -1 - ) - assert result == "" assert pytest_exit.type == SystemExit + display = capsys.readouterr() + if comment.find("Wrong_Char_") != -1: + assert display == "Error: the format of the comment is invalid" + elif len(comment) > tx.MAX_COMMENT_LENGTH: + assert display == "Error: the format of the comment is invalid" + elif "Wrong_Pubkey" in outputAddresses: + assert display.out.find("Error: bad format for following public key:") != -1 + elif outputBackChange: + if outputBackChange == "Wrong_Pubkey": + assert display.out.find("Error: bad format for following public key:") != -1 + elif enough_source is True: + assert ( + display.out.find("pubkey doesn’t have enough money for this transaction.") + != -1 + ) + assert result == "" # test generate_unlocks()