From 3fe29eab9040c6dcbb2173ccf3d8c968a63d5af8 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 10 Jun 2016 16:16:33 +1200 Subject: [PATCH] Fix failing tests --- qa/rpc-tests/zcpourdoublespend.py | 4 ++-- src/test/alert_tests.cpp | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qa/rpc-tests/zcpourdoublespend.py b/qa/rpc-tests/zcpourdoublespend.py index 35b0a4d3a..9fc6c263b 100755 --- a/qa/rpc-tests/zcpourdoublespend.py +++ b/qa/rpc-tests/zcpourdoublespend.py @@ -41,8 +41,8 @@ class PourTxTest(BitcoinTestFramework): assert_equal(self.cannot_pour(node, txn), True) def run_test(self): - # All nodes should start with 1,250 BTC: - starting_balance = 1000 + # All nodes should start with 250 BTC: + starting_balance = 250 for i in range(4): assert_equal(self.nodes[i].getbalance(), starting_balance) self.nodes[i].getnewaddress("") # bug workaround, coins generated assigned to first getnewaddress! diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp index 73481dd80..daaec13ed 100644 --- a/src/test/alert_tests.cpp +++ b/src/test/alert_tests.cpp @@ -201,7 +201,7 @@ BOOST_AUTO_TEST_CASE(PartitionAlert) { // Test PartitionCheck CCriticalSection csDummy; - CBlockIndex indexDummy[100]; + CBlockIndex indexDummy[400]; CChainParams& params = Params(CBaseChainParams::MAIN); int64_t nPowTargetSpacing = params.GetConsensus().nPowTargetSpacing; @@ -209,26 +209,26 @@ BOOST_AUTO_TEST_CASE(PartitionAlert) // an arbitrary time: int64_t now = 1427379054; SetMockTime(now); - for (int i = 0; i < 100; i++) + for (int i = 0; i < 400; i++) { indexDummy[i].phashBlock = NULL; if (i == 0) indexDummy[i].pprev = NULL; else indexDummy[i].pprev = &indexDummy[i-1]; indexDummy[i].nHeight = i; - indexDummy[i].nTime = now - (100-i)*nPowTargetSpacing; + indexDummy[i].nTime = now - (400-i)*nPowTargetSpacing; // Other members don't matter, the partition check code doesn't // use them } // Test 1: chain with blocks every nPowTargetSpacing seconds, // as normal, no worries: - PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing); + PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing); BOOST_CHECK(strMiscWarning.empty()); // Test 2: go 3.5 hours without a block, expect a warning: now += 3*60*60+30*60; SetMockTime(now); - PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing); + PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing); BOOST_CHECK(!strMiscWarning.empty()); BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning); strMiscWarning = ""; @@ -237,16 +237,16 @@ BOOST_AUTO_TEST_CASE(PartitionAlert) // code: now += 60*10; SetMockTime(now); - PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing); + PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing); BOOST_CHECK(strMiscWarning.empty()); // Test 4: get 2.5 times as many blocks as expected: now += 60*60*24; // Pretend it is a day later SetMockTime(now); int64_t quickSpacing = nPowTargetSpacing*2/5; - for (int i = 0; i < 100; i++) // Tweak chain timestamps: - indexDummy[i].nTime = now - (100-i)*quickSpacing; - PartitionCheck(falseFunc, csDummy, &indexDummy[99], nPowTargetSpacing); + for (int i = 0; i < 400; i++) // Tweak chain timestamps: + indexDummy[i].nTime = now - (400-i)*quickSpacing; + PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing); BOOST_CHECK(!strMiscWarning.empty()); BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning); strMiscWarning = "";