Change Details

test: Properly raise FailedToStartError when rpc shutdown before warmup finished (MarcoFalke) Pull request description: Should fix issues such as https://travis-ci.org/github/bitcoin/bitcoin/jobs/671910152#L7034 https://github.com/bitcoin/bitcoin/pull/18561/commits/faede1b293354560317b67f0b4e6874dcac6ef41 --- [backport#18633] test: Properly raise FailedToStartError when rpc shutdown before warmup finished (take 2) 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. https://github.com/bitcoin/bitcoin/pull/18633/files --- Backport of Core [[https://github.com/bitcoin/bitcoin/pull/18561 | PR18561]] and 18633

test: Properly raise FailedToStartError when rpc shutdown before warmup finished (MarcoFalke) Pull request description: Should fix issues such as https://travis-ci.org/github/bitcoin/bitcoin/jobs/671910152#L7034 https://github.com/bitcoin/bitcoin/pull/18561/commits/faede1b293354560317b67f0b4e6874dcac6ef41 --- [backport#18633] test: Properly raise FailedToStartError when rpc shutdown before warmup finished (take 2) 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. https://github.com/bitcoin/bitcoin/pull/18633/files --- Backport of Core [[https://github.com/bitcoin/bitcoin/pull/18561 | PR18561]] and [[https://github.com/bitcoin/bitcoin/pull/18633 | PR18633]]

test: Properly raise FailedToStartError when rpc shutdown before warmup finished (MarcoFalke) Pull request description: Should fix issues such as https://travis-ci.org/github/bitcoin/bitcoin/jobs/671910152#L7034 https://github.com/bitcoin/bitcoin/pull/18561/commits/faede1b293354560317b67f0b4e6874dcac6ef41 --- [backport#18633] test: Properly raise FailedToStartError when rpc shutdown before warmup finished (take 2) 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. https://github.com/bitcoin/bitcoin/pull/18633/files --- Backport of Core [[https://github.com/bitcoin/bitcoin/pull/18561 | PR18561]] and [[https://github.com/bitcoin/bitcoin/pull/18633 | PR18633]]