From 35c24d16a4dbea2ea4c35ff1771ce7b5e874790e Mon Sep 17 00:00:00 2001 From: Jude Nelson Date: Wed, 27 Jun 2018 20:41:50 -0400 Subject: [PATCH] fix expect_fail-related bugs --- ...port_nextepoch_epoch3_expire_grace_renewxferup.py | 10 +++++----- .../name_import_nextepoch_epoch3_expire_reregup.py | 10 +++++----- ..._import_nextepoch_preorder_epoch3_expire_grace.py | 8 ++++---- ...mport_nextepoch_transfer_epoch3_expire_reregup.py | 10 +++++----- ...e_import_nextepoch_transfer_epoch3_renewxferup.py | 2 +- .../scenarios/name_import_renew_pay2ns_burn_multi.py | 2 +- ...ort_update_nextepoch_update_epoch3_renewxferup.py | 2 +- .../scenarios/name_pre_epoch3_regup.py | 5 +---- .../scenarios/name_pre_reg_epoch3_renewxferup.py | 4 +--- .../name_pre_reg_epoch3_renewxferup_renewxferup.py | 4 +--- .../scenarios/name_pre_reg_expire_pay2ns_multi.py | 2 +- .../scenarios/name_pre_reg_grace_expire.py | 8 +++----- ...pre_reg_nextepoch_preorder_epoch3_expire_grace.py | 12 +++++------- .../scenarios/name_pre_reg_pay2ns_burn.py | 2 +- .../scenarios/name_pre_reg_pay2ns_fail.py | 2 +- .../scenarios/name_pre_reg_pay2ns_renew_burn.py | 2 +- .../name_pre_reg_pay2ns_renew_burn_multi.py | 2 +- .../scenarios/name_pre_reg_quota_sameblock.py | 4 ++-- 18 files changed, 40 insertions(+), 51 deletions(-) diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_epoch3_expire_grace_renewxferup.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_epoch3_expire_grace_renewxferup.py index 9886f70d0..2747bce07 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_epoch3_expire_grace_renewxferup.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_epoch3_expire_grace_renewxferup.py @@ -163,7 +163,7 @@ def scenario( wallets, **kw ): # begin epoch 3 (grace period) testlib.next_block(**kw) # end of 697 - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False @@ -187,7 +187,7 @@ def scenario( wallets, **kw ): print 'accidentally registered' return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False @@ -210,7 +210,7 @@ def scenario( wallets, **kw ): print 'accidentally registered' return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False @@ -233,7 +233,7 @@ def scenario( wallets, **kw ): print 'accidentally registered' return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False @@ -258,7 +258,7 @@ def scenario( wallets, **kw ): print whois return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_epoch3_expire_reregup.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_epoch3_expire_reregup.py index 3ae71aceb..bd99a15d5 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_epoch3_expire_reregup.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_epoch3_expire_reregup.py @@ -147,7 +147,7 @@ def scenario( wallets, **kw ): return False # safety checks should NOT allow the preorder to go through - resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr) + resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr, expect_fail=True) if 'error' not in resp: print resp return False @@ -156,7 +156,7 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) # end of 697 # safety checks should NOT allow the preorder to go through - resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr) + resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr, expect_fail=True) if 'error' not in resp: print resp return False @@ -164,7 +164,7 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) # 698 # safety checks should NOT allow the preorder to go through - resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr) + resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr, expect_fail=True) if 'error' not in resp: print resp return False @@ -172,7 +172,7 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) # 699 # safety checks should NOT allow the preorder to go through - resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr) + resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr, expect_fail=True) if 'error' not in resp: print resp return False @@ -180,7 +180,7 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) # 700 # safety checks should NOT allow the preorder to go through - resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr) + resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr, expect_fail=True) if 'error' not in resp: print resp return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_preorder_epoch3_expire_grace.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_preorder_epoch3_expire_grace.py index a3fe4650f..bfbd3f66a 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_preorder_epoch3_expire_grace.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_preorder_epoch3_expire_grace.py @@ -228,7 +228,7 @@ def scenario( wallets, **kw ): print json.dumps(whois) return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, expect_fail=True) if 'error' not in resp: print resp return False @@ -257,7 +257,7 @@ def scenario( wallets, **kw ): print 'accidentally registered' return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False @@ -285,7 +285,7 @@ def scenario( wallets, **kw ): print 'accidentally registered' return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False @@ -320,7 +320,7 @@ def scenario( wallets, **kw ): return False # should fail - resp = testlib.blockstack_name_register("foo.test", wallets[3].privkey, wallets[0].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[3].privkey, wallets[0].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_transfer_epoch3_expire_reregup.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_transfer_epoch3_expire_reregup.py index 5377f729b..3c8a2c149 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_transfer_epoch3_expire_reregup.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_transfer_epoch3_expire_reregup.py @@ -152,7 +152,7 @@ def scenario( wallets, **kw ): return False # safety checks should NOT allow the preorder to go through - resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr) + resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr, expect_fail=True) if 'error' not in resp: print resp return False @@ -161,7 +161,7 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) # end of 697 # safety checks should NOT allow the preorder to go through - resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr) + resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr, expect_fail=True) if 'error' not in resp: print resp return False @@ -169,7 +169,7 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) # 698 # safety checks should NOT allow the preorder to go through - resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr) + resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr, expect_fail=True) if 'error' not in resp: print resp return False @@ -177,7 +177,7 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) # 699 # safety checks should NOT allow the preorder to go through - resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr) + resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr, expect_fail=True) if 'error' not in resp: print resp return False @@ -185,7 +185,7 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) # 700 # safety checks should NOT allow the preorder to go through - resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr) + resp = testlib.blockstack_name_preorder('foo.test', wallets[3].privkey, wallets[4].addr, expect_fail=True) if 'error' not in resp: print resp return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_transfer_epoch3_renewxferup.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_transfer_epoch3_renewxferup.py index 04944c6b1..81f806afb 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_transfer_epoch3_renewxferup.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_nextepoch_transfer_epoch3_renewxferup.py @@ -172,7 +172,7 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) # end of 696. Name should be expired # update should be impossible, since we're now in the renewal period - resp = testlib.blockstack_name_update( 'foo.test', '66' * 20, wallets[4].privkey ) + resp = testlib.blockstack_name_update( 'foo.test', '66' * 20, wallets[4].privkey, expect_fail=True) if 'error' not in resp: print resp return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_pay2ns_burn_multi.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_pay2ns_burn_multi.py index 5e146d38a..339d86d3f 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_pay2ns_burn_multi.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_renew_pay2ns_burn_multi.py @@ -95,7 +95,7 @@ def scenario( wallets, **kw ): return False # should be rejected if not burned - res = testlib.blockstack_name_renew('foo.test', wallets[3].privkey, burn_addr=namespace_rec['address']) + res = testlib.blockstack_name_renew('foo.test', wallets[3].privkey, burn_addr=namespace_rec['address'], expect_fail=True) if 'error' not in res: print res return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_import_update_nextepoch_update_epoch3_renewxferup.py b/integration_tests/blockstack_integration_tests/scenarios/name_import_update_nextepoch_update_epoch3_renewxferup.py index 9bd995036..715695615 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_import_update_nextepoch_update_epoch3_renewxferup.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_import_update_nextepoch_update_epoch3_renewxferup.py @@ -182,7 +182,7 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) # end of 696. Name should be expired # update should be impossible, since we're now in the renewal period - resp = testlib.blockstack_name_update( 'foo.test', '66' * 20, wallets[3].privkey ) + resp = testlib.blockstack_name_update( 'foo.test', '66' * 20, wallets[3].privkey, expect_fail=True) if 'error' not in resp: print resp return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_epoch3_regup.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_epoch3_regup.py index 1498fe862..91f369b20 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_epoch3_regup.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_epoch3_regup.py @@ -55,14 +55,11 @@ def scenario( wallets, **kw ): testlib.blockstack_name_preorder( "foo.test", wallets[2].privkey, wallets[3].addr ) testlib.next_block( **kw ) # 692 - ''' - # no longer a relevant test, since we're in epoch 3 now # should fail (safety checks stop it) - resp = testlib.blockstack_name_register('foo.test', wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20) + resp = testlib.blockstack_name_register('foo.test', wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20, expect_fail=True) if 'error' not in resp: print resp return False - ''' # should succeed in being sent, but will be rejected resp = testlib.blockstack_name_register('foo.test', wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20, safety_checks=False, tx_fee=300 * 5) diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_epoch3_renewxferup.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_epoch3_renewxferup.py index dc9b77c87..4cb442204 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_epoch3_renewxferup.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_epoch3_renewxferup.py @@ -63,13 +63,11 @@ def scenario( wallets, **kw ): print whois return False - ''' not relevant anymore, since this tests an old CLI # should fail (safety checks stop it) - resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr ) + resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr, expect_fail=True) if 'error' not in resp: print resp return False - ''' # should succeed in being sent resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr, safety_checks=False, tx_fee=10000 * 5 ) diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_epoch3_renewxferup_renewxferup.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_epoch3_renewxferup_renewxferup.py index abd043d54..7711638b3 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_epoch3_renewxferup_renewxferup.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_epoch3_renewxferup_renewxferup.py @@ -63,13 +63,11 @@ def scenario( wallets, **kw ): print whois return False - ''' this only applies to the old CLI # should fail (safety checks stop it) - resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr ) + resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr, expect_fail=True) if 'error' not in resp: print resp return False - ''' # should succeed in being sent resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr, safety_checks=False, tx_fee=10000 * 5 ) diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_expire_pay2ns_multi.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_expire_pay2ns_multi.py index 9673eae36..5a31236e6 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_expire_pay2ns_multi.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_expire_pay2ns_multi.py @@ -144,7 +144,7 @@ def scenario( wallets, **kw ): return False # try forcing it to the namespace burn address, to verify that it fails - res = testlib.blockstack_name_preorder( "foo_fail.test", wallets[4].privkey, wallets[0].addr, burn_addr=namespace_rec['address'] ) + res = testlib.blockstack_name_preorder( "foo_fail.test", wallets[4].privkey, wallets[0].addr, burn_addr=namespace_rec['address'], expect_fail=True) if 'error' not in res: print res return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_grace_expire.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_grace_expire.py index 13ffd79fa..85c5fa0f3 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_grace_expire.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_grace_expire.py @@ -75,12 +75,10 @@ def scenario( wallets, **kw ): testlib.next_block(**kw) testlib.next_block(**kw) - ''' - res = testlib.blockstack_name_update("foo.test", '22' * 20, wallets[3].privkey) + res = testlib.blockstack_name_update("foo.test", '22' * 20, wallets[3].privkey, expect_fail=True) if 'error' not in res: print res return False - ''' res = testlib.blockstack_name_update("foo.test", '22' * 20, wallets[3].privkey, safety_checks=False, tx_fee=300*5) if 'error' in res: @@ -101,7 +99,7 @@ def scenario( wallets, **kw ): return False # can't transfer - res = testlib.blockstack_name_transfer('foo.test', wallets[4].addr, True, wallets[3].privkey) + res = testlib.blockstack_name_transfer('foo.test', wallets[4].addr, True, wallets[3].privkey, expect_fail=True) if 'error' not in res: print res return False @@ -125,7 +123,7 @@ def scenario( wallets, **kw ): return False # can't revoke - res = testlib.blockstack_name_revoke('foo.test', wallets[3].privkey) + res = testlib.blockstack_name_revoke('foo.test', wallets[3].privkey, expect_fail=True) if 'error' not in res: print res return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_nextepoch_preorder_epoch3_expire_grace.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_nextepoch_preorder_epoch3_expire_grace.py index 43f6faa0b..71710c646 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_nextepoch_preorder_epoch3_expire_grace.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_nextepoch_preorder_epoch3_expire_grace.py @@ -219,7 +219,7 @@ def scenario( wallets, **kw ): print json.dumps(whois) return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, expect_fail=True) if 'error' not in resp: print resp return False @@ -248,7 +248,7 @@ def scenario( wallets, **kw ): print 'accidentally registered' return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False @@ -276,7 +276,7 @@ def scenario( wallets, **kw ): print 'accidentally registered' return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False @@ -304,7 +304,7 @@ def scenario( wallets, **kw ): print 'accidentally registered' return False - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False @@ -334,12 +334,10 @@ def scenario( wallets, **kw ): return False ''' - ''' - resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20) + resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, expect_fail=True) if 'error' not in resp: print resp return False - ''' # should go through, but be rejected resp = testlib.blockstack_name_register("foo.test", wallets[1].privkey, wallets[2].addr, zonefile_hash='44' * 20, safety_checks=False, tx_fee=500*5) diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_burn.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_burn.py index f6584c99e..432f5014f 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_burn.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_burn.py @@ -95,7 +95,7 @@ def scenario( wallets, **kw ): # preorder should send to the null burn address now. # try forcing it to the namespace burn address, to verify that it fails - res = testlib.blockstack_name_preorder( "foo_fail.test", wallets[2].privkey, wallets[3].addr, burn_addr=namespace_rec['address'] ) + res = testlib.blockstack_name_preorder( "foo_fail.test", wallets[2].privkey, wallets[3].addr, burn_addr=namespace_rec['address'], expect_fail=True) if 'error' not in res: print res return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_fail.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_fail.py index a3e97dfc5..464e7f239 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_fail.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_fail.py @@ -62,7 +62,7 @@ def scenario( wallets, **kw ): namespace_balance = testlib.get_balance(namespace_rec['address']) # should fail safety checks - res = testlib.blockstack_name_preorder( "foo.test", wallets[2].privkey, wallets[3].addr, burn_addr=wallets[1].addr ) + res = testlib.blockstack_name_preorder( "foo.test", wallets[2].privkey, wallets[3].addr, burn_addr=wallets[1].addr, expect_fail=True) if 'error' not in res: print res return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_renew_burn.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_renew_burn.py index b00e9b55e..130f98166 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_renew_burn.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_renew_burn.py @@ -107,7 +107,7 @@ def scenario( wallets, **kw ): return False # should be rejected if not burned - res = testlib.blockstack_name_renew('foo.test', wallets[3].privkey, burn_addr=namespace_rec['address']) + res = testlib.blockstack_name_renew('foo.test', wallets[3].privkey, burn_addr=namespace_rec['address'], expect_fail=True) if 'error' not in res: print res return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_renew_burn_multi.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_renew_burn_multi.py index 3c41929b9..8b283ccea 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_renew_burn_multi.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_pay2ns_renew_burn_multi.py @@ -123,7 +123,7 @@ def scenario( wallets, **kw ): return False # should be rejected if not burned - res = testlib.blockstack_name_renew('foo.test', wallets[3].privkey, burn_addr=namespace_rec['address']) + res = testlib.blockstack_name_renew('foo.test', wallets[3].privkey, burn_addr=namespace_rec['address'], expect_fail=True) if 'error' not in res: print res return False diff --git a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_quota_sameblock.py b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_quota_sameblock.py index bf7d14514..a5709b5dd 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_quota_sameblock.py +++ b/integration_tests/blockstack_integration_tests/scenarios/name_pre_reg_quota_sameblock.py @@ -67,7 +67,7 @@ def scenario( wallets, **kw ): testlib.expect_snv_fail_at('foo26.test', testlib.get_current_block(**kw)) # safety checks should prohibit this - resp = testlib.blockstack_name_preorder( "bar.test", wallets[2].privkey, wallets[3].addr ) + resp = testlib.blockstack_name_preorder( "bar.test", wallets[2].privkey, wallets[3].addr, expect_fail=True) if 'error' not in resp: print 'safety check failure on preorder' print json.dumps( resp, indent=4 ) @@ -81,7 +81,7 @@ def scenario( wallets, **kw ): testlib.next_block( **kw ) # safety checks should prohibit this - resp = testlib.blockstack_name_register( "bar.test", wallets[2].privkey, wallets[3].addr) + resp = testlib.blockstack_name_register( "bar.test", wallets[2].privkey, wallets[3].addr, expect_fail=True) if 'error' not in resp: print 'safety check failure' return False