Skip to content
Snippets Groups Projects
Commit 33293c8b authored by matograine's avatar matograine Committed by matograine
Browse files

[test] [fix] #368 : wrong use of context `with pytest.raises() as...`

  * fix wrong tests
parent bf6cfe37
No related branches found
No related tags found
No related merge requests found
Pipeline #10859 passed
...@@ -38,7 +38,7 @@ def test_gen_checksum(pubkey, checksum): ...@@ -38,7 +38,7 @@ def test_gen_checksum(pubkey, checksum):
( (
"J4c8CARmP9vAFNGtHRuzx14zvxojyRWHW2darguVqjtX", "J4c8CARmP9vAFNGtHRuzx14zvxojyRWHW2darguVqjtX",
"KA", "KA",
"Error: Wrong checksum for following public key: J4c8CARmP9vAFNGtHRuzx14zvxojyRWHW2darguVqjtX", "Error: public key 'J4c8CARmP9vAFNGtHRuzx14zvxojyRWHW2darguVqjtX' does not match checksum 'KA'.\nPlease verify the public key.\n",
), ),
], ],
) )
...@@ -49,7 +49,7 @@ def test_validate_checksum(pubkey, checksum, expected, capsys): ...@@ -49,7 +49,7 @@ def test_validate_checksum(pubkey, checksum, expected, capsys):
else: else:
with pytest.raises(SystemExit) as pytest_exit: with pytest.raises(SystemExit) as pytest_exit:
test = crypto_tools.validate_checksum(pubkey_with_ck) test = crypto_tools.validate_checksum(pubkey_with_ck)
assert capsys.readouterr() == expected assert capsys.readouterr().out == expected
assert pytest_exit.type == SystemExit assert pytest_exit.type == SystemExit
...@@ -60,14 +60,14 @@ def test_validate_checksum(pubkey, checksum, expected, capsys): ...@@ -60,14 +60,14 @@ def test_validate_checksum(pubkey, checksum, expected, capsys):
("J4c8CARmP9vAFNGtHRuzx14zvxojyRWHW2darguVqjtX:KAv", True, True), ("J4c8CARmP9vAFNGtHRuzx14zvxojyRWHW2darguVqjtX:KAv", True, True),
("J4c8CARmP9vAFNGtHRuzx14zvxojyRWHW2darguVqjtX", True, False), ("J4c8CARmP9vAFNGtHRuzx14zvxojyRWHW2darguVqjtX", True, False),
("Youpi", False, None), ("Youpi", False, None),
("Youpi", True, "Error: bad format for following public key: Youpi"), ("Youpi", True, "Error: bad format for following public key: Youpi\n"),
], ],
) )
def test_check_pubkey_format(pubkey, display_error, expected, capsys): def test_check_pubkey_format(pubkey, display_error, expected, capsys):
if isinstance(expected, str): if isinstance(expected, str):
with pytest.raises(SystemExit) as pytest_exit: with pytest.raises(SystemExit) as pytest_exit:
test = crypto_tools.check_pubkey_format(pubkey, display_error) test = crypto_tools.check_pubkey_format(pubkey, display_error)
assert capsys.readouterr() == expected assert capsys.readouterr().out == expected
assert pytest_exit.type == SystemExit assert pytest_exit.type == SystemExit
else: else:
assert expected == crypto_tools.check_pubkey_format(pubkey, display_error) assert expected == crypto_tools.check_pubkey_format(pubkey, display_error)
......
...@@ -193,7 +193,7 @@ def test_compute_amounts_errors(capsys): ...@@ -193,7 +193,7 @@ def test_compute_amounts_errors(capsys):
trial[1], trial[1],
) )
assert pytest_exit.type == SystemExit assert pytest_exit.type == SystemExit
expected_error = "Error: amount {0} is too low.".format(trial[0][0]) expected_error = "Error: amount {0} is too low.\n".format(trial[0][0])
assert capsys.readouterr().out == expected_error assert capsys.readouterr().out == expected_error
...@@ -1347,9 +1347,9 @@ def test_check_transaction_values_errors( ...@@ -1347,9 +1347,9 @@ def test_check_transaction_values_errors(
assert pytest_exit.type == SystemExit assert pytest_exit.type == SystemExit
display = capsys.readouterr() display = capsys.readouterr()
if comment.find("Wrong_Char_") != -1: if comment.find("Wrong_Char_") != -1:
assert display == "Error: the format of the comment is invalid" assert display.out == "Error: the format of the comment is invalid\n"
elif len(comment) > tx.MAX_COMMENT_LENGTH: elif len(comment) > tx.MAX_COMMENT_LENGTH:
assert display == "Error: the format of the comment is invalid" assert display.out == "Error: Comment is too long\n"
elif "Wrong_Pubkey" in outputAddresses: elif "Wrong_Pubkey" in outputAddresses:
assert display.out.find("Error: bad format for following public key:") != -1 assert display.out.find("Error: bad format for following public key:") != -1
elif outputBackChange: elif outputBackChange:
...@@ -1360,7 +1360,6 @@ def test_check_transaction_values_errors( ...@@ -1360,7 +1360,6 @@ def test_check_transaction_values_errors(
display.out.find("pubkey doesn’t have enough money for this transaction.") display.out.find("pubkey doesn’t have enough money for this transaction.")
!= -1 != -1
) )
assert result == ""
# test generate_unlocks() # test generate_unlocks()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment