Skip to content

Conversation

@jnewbery
Copy link
Contributor

@jnewbery jnewbery commented Sep 4, 2017

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

@MarcoFalke @sdaftuar

Copy link
Member

@maflcko maflcko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 8fdb6f9

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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might as well get rid of passing member variables to methods.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, but I haven't looked into how big a change that would be (I'd need to look at all calls to add_nodes() to make sure they're not calling this method with no extra_args method and expecting the node to be started with any extra_args equal to [])

@fanquake fanquake added the Tests label Sep 5, 2017
@sdaftuar
Copy link
Member

sdaftuar commented Sep 7, 2017

ACK, this fixes dbcrash.py now

@maflcko maflcko merged commit 8fdb6f9 into bitcoin:master Sep 12, 2017
maflcko pushed a commit that referenced this pull request Sep 12, 2017
8fdb6f9 [tests] fixup dbcrash interaction with add_nodes() (John Newbery)

Pull request description:

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

  @MarcoFalke @sdaftuar

Tree-SHA512: eefce1d1c63dc4a63c5e030a541e046ad4832e8a709c0a8aad40ffdc4712b2065486778b406dfa57cfd34e66db86064278ee3fea8f2c2afd2390772875e6fa3e
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Oct 3, 2017
codablock pushed a commit to codablock/dash that referenced this pull request Sep 24, 2019
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
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants