diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-07-27 11:06:57 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-07-27 11:06:57 +0200 |
| commit | 72f2934e20d0adbb3c88cc9d3837ef3566dd8c97 (patch) | |
| tree | df881e00ccd44c7aabaf60b2de96daf773a7cc92 /tests | |
| parent | Merge pull request #928 (diff) | |
| parent | tests: fix a bitflag test typo (diff) | |
| download | monero-72f2934e20d0adbb3c88cc9d3837ef3566dd8c97.tar.xz | |
Merge pull request #936
4618873 tests: fix a bitflag test typo (moneromooo-monero)
89e68d7 unit_tests: check adding checkpoints succeeded (moneromooo-monero)
121165f db_lmdb: add some missing api call checks (moneromooo-monero)
22d8344 core_rpc_server: fix gray/white peer list mixup (moneromooo-monero)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit_tests/checkpoints.cpp | 6 | ||||
| -rw-r--r-- | tests/unit_tests/epee_levin_protocol_handler_async.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit_tests/checkpoints.cpp b/tests/unit_tests/checkpoints.cpp index cb490023d..b1d251d26 100644 --- a/tests/unit_tests/checkpoints.cpp +++ b/tests/unit_tests/checkpoints.cpp @@ -49,7 +49,7 @@ TEST(checkpoints_is_alternative_block_allowed, handles_empty_checkpoints) TEST(checkpoints_is_alternative_block_allowed, handles_one_checkpoint) { checkpoints cp; - cp.add_checkpoint(5, "0000000000000000000000000000000000000000000000000000000000000000"); + ASSERT_TRUE(cp.add_checkpoint(5, "0000000000000000000000000000000000000000000000000000000000000000")); ASSERT_FALSE(cp.is_alternative_block_allowed(0, 0)); @@ -87,8 +87,8 @@ TEST(checkpoints_is_alternative_block_allowed, handles_one_checkpoint) TEST(checkpoints_is_alternative_block_allowed, handles_two_and_more_checkpoints) { checkpoints cp; - cp.add_checkpoint(5, "0000000000000000000000000000000000000000000000000000000000000000"); - cp.add_checkpoint(9, "0000000000000000000000000000000000000000000000000000000000000000"); + ASSERT_TRUE(cp.add_checkpoint(5, "0000000000000000000000000000000000000000000000000000000000000000")); + ASSERT_TRUE(cp.add_checkpoint(9, "0000000000000000000000000000000000000000000000000000000000000000")); ASSERT_FALSE(cp.is_alternative_block_allowed(0, 0)); diff --git a/tests/unit_tests/epee_levin_protocol_handler_async.cpp b/tests/unit_tests/epee_levin_protocol_handler_async.cpp index dd0ca1549..ca110eb59 100644 --- a/tests/unit_tests/epee_levin_protocol_handler_async.cpp +++ b/tests/unit_tests/epee_levin_protocol_handler_async.cpp @@ -375,7 +375,7 @@ TEST_F(positive_test_connection_to_levin_protocol_handler_calls, handler_process ASSERT_EQ(expected_out_data.size(), resp_head.m_cb); ASSERT_FALSE(resp_head.m_have_to_return_data); ASSERT_EQ(LEVIN_PROTOCOL_VER_1, resp_head.m_protocol_version); - ASSERT_TRUE(0 != (resp_head.m_flags | LEVIN_PACKET_RESPONSE)); + ASSERT_TRUE(0 != (resp_head.m_flags & LEVIN_PACKET_RESPONSE)); } TEST_F(positive_test_connection_to_levin_protocol_handler_calls, handler_processes_handle_read_as_notify) |