aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnson Lau <jl2012@xbt.hk>2017-09-25 18:14:03 +0800
committerJohnson Lau <jl2012@xbt.hk>2017-09-27 16:04:17 +0800
commit49f869fe91716785b3276925d64bf8955feff69f (patch)
tree4543fc9733cb767b0f87c939ea210f29c6a3111a
parent12ed800ab870e0fc527a84d6e4584b10c8d239f5 (diff)
downloadbitcoin-49f869fe91716785b3276925d64bf8955feff69f.tar.xz
Fix bip68-sequence rpc test
-rwxr-xr-xtest/functional/bip68-sequence.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/functional/bip68-sequence.py b/test/functional/bip68-sequence.py
index 3818287209..74f51d8cfb 100755
--- a/test/functional/bip68-sequence.py
+++ b/test/functional/bip68-sequence.py
@@ -369,11 +369,14 @@ class BIP68Test(BitcoinTestFramework):
def activateCSV(self):
# activation should happen at block height 432 (3 periods)
+ # getblockchaininfo will show CSV as active at block 431 (144 * 3 -1) since it's returning whether CSV is active for the next block.
min_activation_height = 432
height = self.nodes[0].getblockcount()
- assert(height < min_activation_height)
- self.nodes[0].generate(min_activation_height-height)
- assert(get_bip9_status(self.nodes[0], 'csv')['status'] == 'active')
+ assert_greater_than(min_activation_height - height, 2)
+ self.nodes[0].generate(min_activation_height - height - 2)
+ assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], "locked_in")
+ self.nodes[0].generate(1)
+ assert_equal(get_bip9_status(self.nodes[0], 'csv')['status'], "active")
sync_blocks(self.nodes)
# Use self.nodes[1] to test that version 2 transactions are standard.