Skip to content

Commit

Permalink
Merge #6322: backport: Merge bitcoin#25034: test: add missing stop_no…
Browse files Browse the repository at this point in the history
…de calls to feature_coinstatsindex and feature_prune

766c2c2 Merge bitcoin#25034: test: add missing stop_node calls to feature_coinstatsindex and feature_prune (MacroFake)

Pull request description:

  ## Issue being fixed or feature implemented
  #6316 follow-up

  ## What was done?

  ## How Has This Been Tested?

  ## Breaking Changes

  ## Checklist:
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  knst:
    ACK 766c2c2
  kwvg:
    utACK 766c2c2
  PastaPastaPasta:
    utACK 766c2c2

Tree-SHA512: f2ea80f427ae7fbff0fec570e5a34c98da165dff50a1012398d60d6253b4a2defbe74a7c35ebe49d086724e590d5d684bd1ecd3cd988a5639cfa88606f4f9975
  • Loading branch information
PastaPastaPasta committed Oct 15, 2024
2 parents 5318d68 + 766c2c2 commit d62fa7c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions test/functional/feature_coinstatsindex.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,13 @@ def _test_coin_stats_index(self):

self.log.info("Test that -reindex-chainstate is disallowed with coinstatsindex")

self.stop_node(1)
self.nodes[1].assert_start_raises_init_error(
expected_msg='Error: -reindex-chainstate option is not compatible with -coinstatsindex. '
'Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.',
extra_args=['-coinstatsindex', '-reindex-chainstate'],
)
self.restart_node(1, extra_args=["-coinstatsindex"])

def _test_use_index_option(self):
self.log.info("Test use_index option for nodes running the index")
Expand Down
1 change: 1 addition & 0 deletions test/functional/test_framework/test_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ def assert_start_raises_init_error(self, extra_args=None, expected_msg=None, mat
Will throw if dashd starts without an error.
Will throw if an expected_msg is provided and it does not match dashd's stdout."""
assert not self.running
with tempfile.NamedTemporaryFile(dir=self.stderr_dir, delete=False) as log_stderr, \
tempfile.NamedTemporaryFile(dir=self.stdout_dir, delete=False) as log_stdout:
try:
Expand Down

0 comments on commit d62fa7c

Please sign in to comment.