Skip to content

Commit

Permalink
Merge #6315: test: call self.generate() in p2p_net_deadlock.py (f…
Browse files Browse the repository at this point in the history
…ollow-up dash#6276)

9b0c506 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](#6288) changed the expected syntax for `generate*` calls and [dash#6276](#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:
    utACK 9b0c506
  PastaPastaPasta:
    utACK 9b0c506

Tree-SHA512: 3b49f0ff4fc5beea8bd48019c581577ebb47cf50c5526e60367740e5deea7fc92451a480abd49b2b3b2a7be7fb9ca2a4aca99c565ef7aaee1ba8cce43e0be776
  • Loading branch information
PastaPastaPasta committed Oct 5, 2024
2 parents 74e54b8 + 9b0c506 commit bda01b1
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions test/functional/p2p_net_deadlock.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ def run_test(self):
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__':
Expand Down

0 comments on commit bda01b1

Please sign in to comment.