Paths

Table of Contentst

Differential D4012

Merge #13517: qa: Remove need to handle the network thread in tests
ClosedPublic
Actions

Authored by jasonbcox on Sep 5 2019, 23:57.

Tags

None

Subscribers

Details

Reviewers

deadalnix
Fabien

Group Reviewers

Restricted Project

Commits

rSTAGINGe45a75f391a1: Merge #13517: qa: Remove need to handle the network thread in tests
rABCe45a75f391a1: Merge #13517: qa: Remove need to handle the network thread in tests

Summary

Merge #13517: qa: Remove need to handle the network thread in tests
fa87da2f172ae2e6dc15e9ed156a3564a8ecfbdd qa: Avoid start/stop of the network thread mid-test (MarcoFalke)

Pull request description:

This simplifies test writing by removing the need to handle the network thread in tests. E.g. start thread, join thread, restart thread mid-test, adding p2p connections at the "right" time, ...

Tree-SHA512: 533642f12fef5496f1933855edcdab1a7ed901d088d34911749cd0f9e044c8a6cb1f89985ac3a7f41a512943663e4e270a61978f6f072143ae050cd102d4eab8

Backport of Core PR13517
https://github.com/bitcoin/bitcoin/pull/13517/files
Completes T676
Depends on D4002, D4011

Merge #13715: tests: fixes mininode's P2PConnection sending messages on closing transport
ea5340c9d2 tests: fixes mininode's P2PConnection sending messages on closing transport (marcoagner)

Pull request description:

Fixes #13579.
I think one possible solution is to check for [`_transport.is_closing()`](https://docs.python.org/3.4/library/asyncio-protocol.html#asyncio.BaseTransport.is_closing) in the lambda before sending a message (compatible with Python 3.4 too). Let me know if I missed any side effects this introduces.

Tree-SHA512: cab46f81dccfec7b4460fda478a617845564520694449a9e85bf8a5f1e75f35f52cafd7c64966712c3d6c29956344d5a9dbad8851424f061eb3748bc621b900b

Backport of Core PR13715
https://github.com/bitcoin/bitcoin/pull/13715/files
Completes T678

Both backports included because feature_assumevalid.py breaks without PR13715

Test Plan

test_runner.py

Diff Detail

Repository

rABC Bitcoin ABC

Branch

pr13517-wdeps

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 7338
Build 12719: Bitcoin ABC Buildbot (legacy)
Build 12718: arc lint + arc unit

Event Timeline

jasonbcox created this revision.Sep 5 2019, 23:57

Herald added a reviewer: deadalnix. · View Herald TranscriptSep 5 2019, 23:57

Build Bitcoin-ABC / Diffs / Diff Testing started.

Harbormaster failed remote builds in B7338: Diff 11115!Sep 6 2019, 00:02

Build Bitcoin-ABC / Diffs / Diff Testing failed.

jasonbcox added a child revision: D4013: Merge #13715: tests: fixes mininode's P2PConnection sending messages on closing transport.Sep 6 2019, 00:12

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing failed.

This is causing feature_assumevalid to fail with socket.send() raised exception.. This is a repeatable issue.

This revision now requires changes to proceed.Sep 6 2019, 07:21

I've just seen D4013 which fixes the issue. Since it's a one liner please squash to avoid introducing test failure.

Fabien mentioned this in D4013: Merge #13715: tests: fixes mininode's P2PConnection sending messages on closing transport.Sep 6 2019, 07:42

Merged in D4013 to fix flaky feature_assumevalid

Build Bitcoin-ABC / Diffs / Diff Testing started.

Harbormaster completed remote builds in B7343: Diff 11123.Sep 6 2019, 15:21

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

jasonbcox edited the summary of this revision. (Show Details)Sep 6 2019, 15:46

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

Fabien accepted this revision.Sep 6 2019, 15:51

This revision is now accepted and ready to land.Sep 6 2019, 15:51

Closed by commit rABCe45a75f391a1: Merge #13517: qa: Remove need to handle the network thread in tests (authored by Wladimir J. van der Laan <laanwj@gmail.com>, committed by jasonbcox). · Explain WhySep 6 2019, 15:52

This revision was automatically updated to reflect the committed changes.

jasonbcox added a commit: rABCe45a75f391a1: Merge #13517: qa: Remove need to handle the network thread in tests.

jasonbcox added a commit: rSTAGINGe45a75f391a1: Merge #13517: qa: Remove need to handle the network thread in tests.Sep 19 2019, 02:09

Revision Contents
Changeset List

Path

Size

doc/

functional-tests.md

6 lines

test/

functional/

abc-invalid-chains.py

3 lines

abc-invalid-message.py

12 lines

abc-mempool-accept-txn.py

2 lines

abc-mempool-coherence-on-activations.py

3 lines

abc-minimaldata-activation.py

4 lines

abc-p2p-compactblocks.py

2 lines

abc-p2p-fullblocktest.py

3 lines

abc-replay-protection.py

3 lines

4 lines

abc-schnorrmultisig-activation.py

4 lines

abc-segwit-recovery.py

4 lines

abc-sync-chain.py

12 lines

abc-transaction-ordering.py

3 lines

example_test.py

10 lines

feature_assumevalid.py

12 lines

feature_block.py

4 lines

feature_cltv.py

5 lines

feature_csv_activation.py

3 lines

feature_dersig.py

3 lines

feature_maxuploadtarget.py

5 lines

feature_nulldummy.py

2 lines

p2p_compactblocks.py

5 lines

p2p_feefilter.py

4 lines

p2p_fingerprint.py

4 lines

p2p_invalid_block.py

4 lines

p2p_invalid_tx.py

4 lines

7 lines

3 lines

3 lines

p2p_node_network_limited.py

5 lines

p2p_sendheaders.py

7 lines

p2p_timeouts.py

6 lines

p2p_unrequested_blocks.py

12 lines

rpc_blockchain.py

2 lines

test_framework/

3 lines

198 lines

test_framework.py

8 lines

2 lines

Diff 11115

doc/functional-tests.md

Loading...

test/functional/abc-invalid-chains.py

Loading...

test/functional/abc-invalid-message.py

Loading...

test/functional/abc-mempool-accept-txn.py

Loading...

test/functional/abc-mempool-coherence-on-activations.py

Loading...

test/functional/abc-minimaldata-activation.py

Loading...

test/functional/abc-p2p-compactblocks.py

Loading...

test/functional/abc-p2p-fullblocktest.py

Loading...

test/functional/abc-replay-protection.py

Loading...

test/functional/abc-schnorr.py

Loading...

test/functional/abc-schnorrmultisig-activation.py

Loading...

test/functional/abc-segwit-recovery.py

Loading...

test/functional/abc-sync-chain.py

Loading...

test/functional/abc-transaction-ordering.py

Loading...

test/functional/example_test.py

Loading...

test/functional/feature_assumevalid.py

Loading...

test/functional/feature_block.py

Loading...

test/functional/feature_cltv.py

Loading...

test/functional/feature_csv_activation.py

Loading...

test/functional/feature_dersig.py

Loading...

test/functional/feature_maxuploadtarget.py

Loading...

test/functional/feature_nulldummy.py

Loading...

test/functional/p2p_compactblocks.py

Loading...

test/functional/p2p_feefilter.py

Loading...

test/functional/p2p_fingerprint.py

Loading...

test/functional/p2p_invalid_block.py

Loading...

test/functional/p2p_invalid_tx.py

Loading...

test/functional/p2p_leak.py

Loading...

test/functional/p2p_leak_tx.py

Loading...

test/functional/p2p_mempool.py

Loading...

test/functional/p2p_node_network_limited.py

Loading...

test/functional/p2p_sendheaders.py

Loading...

test/functional/p2p_timeouts.py

Loading...

test/functional/p2p_unrequested_blocks.py

Loading...

test/functional/rpc_blockchain.py

Loading...

test/functional/test_framework/messages.py

Loading...

test/functional/test_framework/mininode.py

Loading...

test/functional/test_framework/test_framework.py

Loading...

test/functional/test_framework/test_node.py

Loading...