mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
Merge #6315: test: call self.generate()
in p2p_net_deadlock.py
(follow-up dash#6276)
9b0c506cf0
test: call `self.generate()` in `p2p_net_deadlock.py` (Kittywhiskers Van Gogh) Pull request description: ## Additional Information `develop` is currently borked ([build](https://gitlab.com/dashpay/dash/-/jobs/7999893074#L266)) because [dash#6288](https://github.com/dashpay/dash/pull/6288) changed the expected syntax for `generate*` calls and [dash#6276](https://github.com/dashpay/dash/pull/6276) introduced a new test (`p2p_net_deadlock.py`) that was based on a version of `develop` that used the older syntax. No conflicts were reported because it was a new file introduced in the latter PR that the former PR did not have knowledge of. ## Breaking changes None expected. ## Checklist: - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK9b0c506cf0
PastaPastaPasta: utACK9b0c506cf0
Tree-SHA512: 3b49f0ff4fc5beea8bd48019c581577ebb47cf50c5526e60367740e5deea7fc92451a480abd49b2b3b2a7be7fb9ca2a4aca99c565ef7aaee1ba8cce43e0be776
This commit is contained in:
commit
bda01b19e6
@ -29,8 +29,7 @@ class NetDeadlockTest(BitcoinTestFramework):
|
||||
thread1.join()
|
||||
|
||||
self.log.info("Check whether a deadlock happened")
|
||||
self.nodes[0].generate(1)
|
||||
self.sync_blocks()
|
||||
self.generate(self.nodes[0], 1)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
Loading…
Reference in New Issue
Block a user