Skip to content

Commit

Permalink
Merge bitcoin#11230: [tests] fixup dbcrash interaction with add_nodes()
Browse files Browse the repository at this point in the history
8fdb6f9 [tests] fixup dbcrash interaction with add_nodes() (John Newbery)

Pull request description:

  Another conflict with bitcoin#11121. Apologies - this is entirely my fault. I didn't run the extended test suite after rebasing on master.

  @MarcoFalke @sdaftuar

Tree-SHA512: eefce1d1c63dc4a63c5e030a541e046ad4832e8a709c0a8aad40ffdc4712b2065486778b406dfa57cfd34e66db86064278ee3fea8f2c2afd2390772875e6fa3e
  • Loading branch information
MarcoFalke committed Sep 12, 2017
2 parents b9bceaf + 8fdb6f9 commit b37cab6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/functional/dbcrash.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def set_test_params(self):

def setup_network(self):
# Need a bit of extra time for the nodes to start up for this test
self.add_nodes(self.num_nodes, timewait=90)
self.add_nodes(self.num_nodes, extra_args=self.extra_args, timewait=90)
self.start_nodes()
# Leave them unconnected, we'll use submitblock directly in this test

Expand Down

0 comments on commit b37cab6

Please sign in to comment.