[tests] Update start/stop node functions to be private module functions
ClosedPublic
Actions

Authored by deadalnix on Jan 20 2018, 19:25.

Details

Reviewers

matiu

Group Reviewers

Restricted Project

Maniphest Tasks

T149: Backport of Core PR 10171: [tests] Add node methods to test framework

Commits

rSTAGING5fcce3f3defa: [tests] Update start/stop node functions to be private module functions
rABC5fcce3f3defa: [tests] Update start/stop node functions to be private module functions

Summary

This commit marks the start/stop functions in util.py as private module
functions. A future PR will remove these entirely and move the
functionality directly into the BitcoinTestFramework class, but setting them as
private in this PR will prevent anyone from accidentally calling them
before that future PR is merged.

This ends the backport of core's PR10359

This was also amended to prt the test thatare specific to ABC.

Depends on D991
Closes T149

Test Plan

make check
./test/functional/test_runner.py --extended

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

deadalnix created this revision.Jan 20 2018, 19:25

Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 20 2018, 19:25

Harbormaster completed remote builds in B1677: Diff 2609.Jan 20 2018, 19:26

Build Bitcoin-ABC :: Staging :: Bitcoin-ABC Staging started.

Build Bitcoin-ABC :: Staging :: Bitcoin-ABC Staging failed.

schancel edited the summary of this revision. (Show Details)Jan 20 2018, 20:07

schancel edited the summary of this revision. (Show Details)

schancel added a task: T149: Backport of Core PR 10171: [tests] Add node methods to test framework.

deadalnix added a child revision: D1001: [tests] Move stop_node and start_node methods to BitcoinTestFramework.Jan 21 2018, 03:01

OK, I see that some changes from
https://github.com/bitcoin/bitcoin/pull/10359/files
are already applied current master 9e9e088: like abandonconflict.py
https://github.com/bitcoin/bitcoin/pull/10359/files#diff-401ca62066f6793c4c39811aea5fdcc8R76

I grep'ed with the Diff applied; and it seems we should remove

start_nodes,

at https://github.com/Bitcoin-ABC/bitcoin-abc/blob/master/test/functional/zmq_test.py#L16

(That change is not on PR10359)

I run --the extended test locally and I got 2 failed tests:

fundrawtransaction.py          | Failed | 36s
zmq_test.py                    | Failed | 0s

fundrawtransaction.py:
2018-01-21 17:44:14.313000 TestFramework (INFO): Initializing test directory /var/folders/x8/hdljhnjn42j45qy5jzjc2sn40000gp/T/testfma6sjjx/393
2018-01-21 17:44:43.075000 TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/Users/ematiu/dev/bitcoin-abc/test/functional/test_framework/util.py", line 346, in _start_nodes
    i, dirname, extra_args[i], rpchost, timewait=timewait, binary=binary[i]))
  File "/Users/ematiu/dev/bitcoin-abc/test/functional/test_framework/util.py", line 298, in _start_node
    wait_for_bitcoind_start(bitcoind_processes[i], url, i)
  File "/Users/ematiu/dev/bitcoin-abc/test/functional/test_framework/util.py", line 243, in wait_for_bitcoind_start
    'bitcoind exited with status %i during initialization' % process.returncode)
Exception: bitcoind exited with status 1 during initialization

and

zmq_test.py:

stderr:
Traceback (most recent call last):
  File "/Users/ematiu/dev/bitcoin-abc/build/../test/functional/zmq_test.py", line 13, in <module>
    from test_framework.util import (
ImportError: cannot import name 'start_nodes'

matiu requested changes to this revision.Jan 21 2018, 17:50

This revision now requires changes to proceed.Jan 21 2018, 17:50

Rebase and make sure fundrawtransaction and zmq_test are passing.

Harbormaster completed remote builds in B1711: Diff 2653.Jan 21 2018, 20:18

Build Bitcoin-ABC :: Staging :: Bitcoin-ABC Staging started.

Tested ok.

This revision is now accepted and ready to land.Jan 21 2018, 20:38

Build Bitcoin-ABC :: Staging :: Bitcoin-ABC Staging passed.

Closed by commit rABC5fcce3f3defa: [tests] Update start/stop node functions to be private module functions (authored by John Newbery <john@johnnewbery.com>, committed by deadalnix). · Explain WhyJan 21 2018, 23:31

This revision was automatically updated to reflect the committed changes.