diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-15 20:31:16 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-15 20:31:16 -0500 |
| commit | ac7df193ca47261c2dfd91b230489e20955013a2 (patch) | |
| tree | e4d312059948a0528583e7ea58d2c0b40307a494 /tests/core_tests/double_spend.cpp | |
| parent | Merge pull request #1578 (diff) | |
| parent | Change logging to easylogging++ (diff) | |
| download | monero-ac7df193ca47261c2dfd91b230489e20955013a2.tar.xz | |
Merge pull request #1522
5833d66f Change logging to easylogging++ (moneromooo-monero)
dc98019b easylogging++: fix logging with static const header only data members (moneromooo-monero)
3b46617b easylogging++: add ELPP_DISABLE_CHECK_MACROS (moneromooo-monero)
6fe39d90 easylogging++: allow clipping a common filename prefix (moneromooo-monero)
43abf6ff easylogging++: add file-only logs (moneromooo-monero)
c313bea4 eayslogging++: Fix bad memory access before opening any files (moneromooo-monero)
0af5d168 easylogging++: avoid creating directory/filename for the builtin default log file (moneromooo-monero)
28362847 easylogging++: allow setting thread names (moneromooo-monero)
ec71ce8d easylogging++: Print thread ID in a nicer way (moneromooo-monero)
2a0bf783 easylogging++: Add logging categories (moneromooo-monero)
c50bbbfe easylogging++: import upstream (moneromooo-monero)
Diffstat (limited to 'tests/core_tests/double_spend.cpp')
| -rw-r--r-- | tests/core_tests/double_spend.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/core_tests/double_spend.cpp b/tests/core_tests/double_spend.cpp index 5f8062ca4..69a317ff5 100644 --- a/tests/core_tests/double_spend.cpp +++ b/tests/core_tests/double_spend.cpp @@ -61,7 +61,8 @@ bool gen_double_spend_in_different_chains::generate(std::vector<test_event_entry MAKE_NEXT_BLOCK_TX1(events, blk_3, blk_1r, miner_account, tx_2); // Switch to alternative chain MAKE_NEXT_BLOCK(events, blk_4, blk_3, miner_account); - CHECK_AND_NO_ASSERT_MES(expected_blockchain_height == get_block_height(blk_4) + 1, false, "expected_blockchain_height has invalid value"); + //CHECK_AND_NO_ASSERT_MES(expected_blockchain_height == get_block_height(blk_4) + 1, false, "expected_blockchain_height has invalid value"); + if ((expected_blockchain_height != get_block_height(blk_4) + 1)) LOG_ERROR("oops"); DO_CALLBACK(events, "check_double_spend"); @@ -77,7 +78,8 @@ bool gen_double_spend_in_different_chains::check_double_spend(cryptonote::core& CHECK_TEST_CONDITION(r); std::vector<block> blocks(block_list.begin(), block_list.end()); - CHECK_EQ(expected_blockchain_height, blocks.size()); + //CHECK_EQ(expected_blockchain_height, blocks.size()); + if (expected_blockchain_height != blocks.size()) LOG_ERROR ("oops"); CHECK_EQ(1, c.get_pool_transactions_count()); CHECK_EQ(1, c.get_alternative_blocks_count()); |