diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-04-19 06:10:04 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-04-19 06:10:06 -0400 |
| commit | b690b24eb213d3c93cf470b9f973e523c68eede8 (patch) | |
| tree | 3b5246908e3d7245eab5d84856f2a09d3036c62a /src/qt/res | |
| parent | d65631171cf87a1b25d50317a9e27338a4dc0d8b (diff) | |
| parent | fa03713e133e3017112fdd5c278e0c8643054578 (diff) | |
| download | bitcoin-b690b24eb213d3c93cf470b9f973e523c68eede8.tar.xz | |
Merge #18633: test: Properly raise FailedToStartError when rpc shutdown before warmup finished (take 2)
fa03713e133e3017112fdd5c278e0c8643054578 test: Properly raise FailedToStartError when rpc shutdown before warmup finished (take 2) (MarcoFalke)
Pull request description:
actually (?) fix #18561
See most recent traceback https://travis-ci.org/github/bitcoin/bitcoin/jobs/674668692#L7062
I believe the reason the error is still there is that ConnectionResetError is derived from OSError:
ConnectionResetError(ConnectionError(OSError))
And IOError is an alias for OSError since python 3.3, see https://docs.python.org/3/library/exceptions.html#IOError
So fix that by renaming IOError to the alias OSError and move the less specific catch clause down a few lines.
ACKs for top commit:
jonatack:
ACK fa03713e133e3017112fdd5c278e0c8643054578
Tree-SHA512: 6e5b214ed9101bf8ebe7472dcc1f9e9d128e2575c93ec00c8d0774ae1a9b52a8c2a653a45a0eab8d881570b08dd5ffeddf5aca88a10438c366e1f633253cb0b5
Diffstat (limited to 'src/qt/res')
0 files changed, 0 insertions, 0 deletions