Merge lp:~jelmer/brz/git-transport-error into lp:brz/3.2

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/git-transport-error
Merge into: lp:brz/3.2
Diff against target: 28 lines (+7/-0)
2 files modified
breezy/git/remote.py (+2/-0)
breezy/git/tests/test_remote.py (+5/-0)
To merge this branch: bzr merge lp:~jelmer/brz/git-transport-error
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+415816@code.launchpad.net

Commit message

Handle connection closed errors.

Description of the change

handle connection closed errors.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py 2022-02-18 00:33:13 +0000
+++ breezy/git/remote.py 2022-02-21 01:31:56 +0000
@@ -221,6 +221,8 @@
221 return TransportError('Host key verification failed')221 return TransportError('Host key verification failed')
222 if message == '[Errno 104] Connection reset by peer':222 if message == '[Errno 104] Connection reset by peer':
223 return ConnectionReset(message)223 return ConnectionReset(message)
224 if message == 'The remote server unexpectedly closed the connection.':
225 return TransportError(message)
224 # Don't know, just return it to the user as-is226 # Don't know, just return it to the user as-is
225 return RemoteGitError(message)227 return RemoteGitError(message)
226228
227229
=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py 2022-02-18 00:33:13 +0000
+++ breezy/git/tests/test_remote.py 2022-02-21 01:31:56 +0000
@@ -97,6 +97,11 @@
97 e = parse_git_error("url", "foo")97 e = parse_git_error("url", "foo")
98 self.assertIsInstance(e, RemoteGitError)98 self.assertIsInstance(e, RemoteGitError)
9999
100 def test_connection_closed(self):
101 e = parse_git_error(
102 "url", "The remote server unexpectedly closed the connection.")
103 self.assertIsInstance(e, TransportError)
104
100 def test_notbrancherror(self):105 def test_notbrancherror(self):
101 e = parse_git_error("url", "\n Could not find Repository foo/bar")106 e = parse_git_error("url", "\n Could not find Repository foo/bar")
102 self.assertIsInstance(e, NotBranchError)107 self.assertIsInstance(e, NotBranchError)

Subscribers

People subscribed via source and target branches