Rev 3575: Remote duplication of error translation in bzrlib/remote.py. (Andrew in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Jul 24 00:29:36 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3575
revision-id:pqm at pqm.ubuntu.com-20080723232923-z04bd6zco9cpa3zv
parent: pqm at pqm.ubuntu.com-20080723220742-a8lvchadnsga1wxy
parent: andrew.bennetts at canonical.com-20080723225338-d7fkouy3h3q195cu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-07-24 00:29:23 +0100
message:
Remote duplication of error translation in bzrlib/remote.py. (Andrew
Bennetts)
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3533.3.5
revision-id:andrew.bennetts at canonical.com-20080723225338-d7fkouy3h3q195cu
parent: andrew.bennetts at canonical.com-20080723111810-4xhz3ia298444oyg
parent: pqm at pqm.ubuntu.com-20080723220742-a8lvchadnsga1wxy
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-translate-error
timestamp: Thu 2008-07-24 08:53:38 +1000
message:
Merge from bzr.dev.
added:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3533.3.4
revision-id:andrew.bennetts at canonical.com-20080723111810-4xhz3ia298444oyg
parent: andrew.bennetts at canonical.com-20080723081003-fa7hm8rl07mnp91r
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-translate-error
timestamp: Wed 2008-07-23 21:18:10 +1000
message:
Add tests for _translate_error's robustness.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3533.3.3
revision-id:andrew.bennetts at canonical.com-20080723081003-fa7hm8rl07mnp91r
parent: andrew.bennetts at canonical.com-20080718052215-litbf3xf9me5q3cp
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-translate-error
timestamp: Wed 2008-07-23 18:10:03 +1000
message:
Add unit tests for bzrlib.remote._translate_error.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3533.3.2
revision-id:andrew.bennetts at canonical.com-20080718052215-litbf3xf9me5q3cp
parent: andrew.bennetts at canonical.com-20080709042605-rdx9mqaufe2gukb4
parent: pqm at pqm.ubuntu.com-20080717225948-n84fbip5sl9n1mde
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-translate-error
timestamp: Fri 2008-07-18 15:22:15 +1000
message:
Merge bzr.dev.
added:
bzrlib/_walkdirs_win32.h _walkdirs_win32.h-20080716220454-kweh3tgxez5dvw2l-1
bzrlib/_walkdirs_win32.pyx _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/repository_implementations/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
doc/en/user-guide/stacked.txt stacked.txt-20080711023247-4uh9oovoka0sze8b-1
tools/win32/run_script.py run_script.py-20080717003927-k6itvarbtnwk44o9-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3533.3.1
revision-id:andrew.bennetts at canonical.com-20080709042605-rdx9mqaufe2gukb4
parent: pqm at pqm.ubuntu.com-20080708172503-gl2dtaz3v7fyc2sl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-error-translation
timestamp: Wed 2008-07-09 14:26:05 +1000
message:
Remove duplication of error translation in bzrlib/remote.py.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2008-07-14 16:16:48 +0000
+++ b/bzrlib/errors.py 2008-07-23 08:10:03 +0000
@@ -135,6 +135,11 @@
getattr(self, '_fmt', None),
)
+ def __eq__(self, other):
+ if self.__class__ != other.__class__:
+ return NotImplemented
+ return self.__dict__ == other.__dict__
+
class InternalBzrError(BzrError):
"""Base class for errors that are internal in nature.
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2008-07-22 00:08:17 +0000
+++ b/bzrlib/remote.py 2008-07-23 22:53:38 +0000
@@ -92,6 +92,9 @@
self._ensure_real()
return self._real_bzrdir.cloning_metadir()
+ def _translate_error(self, err, **context):
+ _translate_error(err, bzrdir=self, **context)
+
def create_repository(self, shared=False):
self._ensure_real()
self._real_bzrdir.create_repository(shared=shared)
@@ -129,9 +132,7 @@
try:
response = self._client.call('BzrDir.open_branch', path)
except errors.ErrorFromSmartServer, err:
- if err.error_tuple == ('nobranch',):
- raise errors.NotBranchError(path=self.root_transport.base)
- raise
+ self._translate_error(err)
if response[0] == 'ok':
if response[1] == '':
# branch at this location.
@@ -168,9 +169,7 @@
verb = 'BzrDir.find_repository'
response = self._client.call(verb, path)
except errors.ErrorFromSmartServer, err:
- if err.error_verb == 'norepository':
- raise errors.NoRepositoryPresent(self)
- raise
+ self._translate_error(err)
if response[0] != 'ok':
raise errors.UnexpectedSmartServerResponse(response)
if verb == 'BzrDir.find_repository':
@@ -362,6 +361,9 @@
#self._real_repository = self.bzrdir._real_bzrdir.open_repository()
self._set_real_repository(self.bzrdir._real_bzrdir.open_repository())
+ def _translate_error(self, err, **context):
+ self.bzrdir._translate_error(err, repository=self, **context)
+
def find_text_key_references(self):
"""Find the text key references within the repository.
@@ -404,9 +406,7 @@
response = self._client.call_expecting_body(
'Repository.get_revision_graph', path, revision_id)
except errors.ErrorFromSmartServer, err:
- if err.error_verb == 'nosuchrevision':
- raise NoSuchRevision(self, revision_id)
- raise
+ self._translate_error(err)
response_tuple, response_handler = response
if response_tuple[0] != 'ok':
raise errors.UnexpectedSmartServerResponse(response_tuple)
@@ -541,13 +541,7 @@
try:
response = self._client.call('Repository.lock_write', path, token)
except errors.ErrorFromSmartServer, err:
- if err.error_verb == 'LockContention':
- raise errors.LockContention('(remote lock)')
- elif err.error_verb == 'UnlockableTransport':
- raise errors.UnlockableTransport(self.bzrdir.root_transport)
- elif err.error_verb == 'LockFailed':
- raise errors.LockFailed(err.error_args[0], err.error_args[1])
- raise
+ self._translate_error(err, token=token)
if response[0] == 'ok':
ok, token = response
@@ -624,9 +618,7 @@
try:
response = self._client.call('Repository.unlock', path, token)
except errors.ErrorFromSmartServer, err:
- if err.error_verb == 'TokenMismatch':
- raise errors.TokenMismatch(token, '(remote token)')
- raise
+ self._translate_error(err, token=token)
if response == ('ok',):
return
else:
@@ -1292,6 +1284,9 @@
if self._lock_mode == 'r':
self._real_branch.lock_read()
+ def _translate_error(self, err, **context):
+ self.repository._translate_error(err, branch=self, **context)
+
def _clear_cached_state(self):
super(RemoteBranch, self)._clear_cached_state()
if self._real_branch is not None:
@@ -1361,17 +1356,7 @@
response = self._client.call(
'Branch.lock_write', path, branch_token, repo_token or '')
except errors.ErrorFromSmartServer, err:
- if err.error_verb == 'LockContention':
- raise errors.LockContention('(remote lock)')
- elif err.error_verb == 'TokenMismatch':
- raise errors.TokenMismatch(token, '(remote token)')
- elif err.error_verb == 'UnlockableTransport':
- raise errors.UnlockableTransport(self.bzrdir.root_transport)
- elif err.error_verb == 'ReadOnlyError':
- raise errors.ReadOnlyError(self)
- elif err.error_verb == 'LockFailed':
- raise errors.LockFailed(err.error_args[0], err.error_args[1])
- raise
+ self._translate_error(err, token=token)
if response[0] != 'ok':
raise errors.UnexpectedSmartServerResponse(response)
ok, branch_token, repo_token = response
@@ -1422,10 +1407,7 @@
response = self._client.call('Branch.unlock', path, branch_token,
repo_token or '')
except errors.ErrorFromSmartServer, err:
- if err.error_verb == 'TokenMismatch':
- raise errors.TokenMismatch(
- str((branch_token, repo_token)), '(remote tokens)')
- raise
+ self._translate_error(err, token=str((branch_token, repo_token)))
if response == ('ok',):
return
raise errors.UnexpectedSmartServerResponse(response)
@@ -1501,11 +1483,7 @@
path, self._lock_token, self._repo_lock_token, revision_id,
int(allow_diverged), int(allow_overwrite_descendant))
except errors.ErrorFromSmartServer, err:
- if err.error_verb == 'NoSuchRevision':
- raise NoSuchRevision(self, revision_id)
- elif err.error_verb == 'Diverged':
- raise errors.DivergedBranches(self, other_branch)
- raise
+ self._translate_error(err, other_branch=other_branch)
self._clear_cached_state()
if len(response) != 3 and response[0] != 'ok':
raise errors.UnexpectedSmartServerResponse(response)
@@ -1520,9 +1498,7 @@
response = self._client.call('Branch.set_last_revision',
path, self._lock_token, self._repo_lock_token, revision_id)
except errors.ErrorFromSmartServer, err:
- if err.error_verb == 'NoSuchRevision':
- raise NoSuchRevision(self, revision_id)
- raise
+ self._translate_error(err)
if response != ('ok',):
raise errors.UnexpectedSmartServerResponse(response)
@@ -1601,9 +1577,7 @@
self._last_revision_info_cache = revno, revision_id
return
except errors.ErrorFromSmartServer, err:
- if err.error_verb == 'NoSuchRevision':
- raise NoSuchRevision(self, err.error_args[0])
- raise
+ self._translate_error(err)
if response == ('ok',):
self._clear_cached_state()
self._last_revision_info_cache = revno, revision_id
@@ -1686,3 +1660,41 @@
"""
for tarinfo in tar:
tar.extract(tarinfo, to_dir)
+
+
+def _translate_error(err, **context):
+ """Translate an ErrorFromSmartServer into a more useful error.
+
+ Possible context keys:
+ - branch
+ - repository
+ - bzrdir
+ - token
+ - other_branch
+ """
+ def find(name):
+ try:
+ return context[name]
+ except KeyError, keyErr:
+ mutter('Missing key %r in context %r', keyErr.args[0], context)
+ raise err
+ if err.error_verb == 'NoSuchRevision':
+ raise NoSuchRevision(find('branch'), err.error_args[0])
+ elif err.error_verb == 'nosuchrevision':
+ raise NoSuchRevision(find('repository'), err.error_args[0])
+ elif err.error_tuple == ('nobranch',):
+ raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
+ elif err.error_verb == 'norepository':
+ raise errors.NoRepositoryPresent(find('bzrdir'))
+ elif err.error_verb == 'LockContention':
+ raise errors.LockContention('(remote lock)')
+ elif err.error_verb == 'UnlockableTransport':
+ raise errors.UnlockableTransport(find('bzrdir').root_transport)
+ elif err.error_verb == 'LockFailed':
+ raise errors.LockFailed(err.error_args[0], err.error_args[1])
+ elif err.error_verb == 'TokenMismatch':
+ raise errors.TokenMismatch(find('token'), '(remote token)')
+ elif err.error_verb == 'Diverged':
+ raise errors.DivergedBranches(find('branch'), find('other_branch'))
+ raise
+
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2008-06-25 22:27:57 +0000
+++ b/bzrlib/tests/test_remote.py 2008-07-23 11:18:10 +0000
@@ -541,7 +541,8 @@
client.add_success_response('ok')
bzrdir = RemoteBzrDir(transport, _client=False)
- branch = RemoteBranch(bzrdir, None, _client=client)
+ repo = RemoteRepository(bzrdir, None, _client=client)
+ branch = RemoteBranch(bzrdir, repo, _client=client)
branch._ensure_real = lambda: None
branch.lock_write()
client._calls = []
@@ -597,7 +598,8 @@
client.add_success_response('ok')
bzrdir = RemoteBzrDir(transport, _client=False)
- branch = RemoteBranch(bzrdir, None, _client=client)
+ repo = RemoteRepository(bzrdir, None, _client=client)
+ branch = RemoteBranch(bzrdir, repo, _client=client)
# This is a hack to work around the problem that RemoteBranch currently
# unnecessarily invokes _ensure_real upon a call to lock_write.
branch._ensure_real = lambda: None
@@ -672,7 +674,8 @@
client.add_success_response('ok')
bzrdir = RemoteBzrDir(transport, _client=False)
- branch = RemoteBranch(bzrdir, None, _client=client)
+ repo = RemoteRepository(bzrdir, None, _client=client)
+ branch = RemoteBranch(bzrdir, repo, _client=client)
# This is a hack to work around the problem that RemoteBranch currently
# unnecessarily invokes _ensure_real upon a call to lock_write.
branch._ensure_real = lambda: None
@@ -723,7 +726,8 @@
transport = transport.clone('quack')
# we do not want bzrdir to make any remote calls
bzrdir = RemoteBzrDir(transport, _client=False)
- branch = RemoteBranch(bzrdir, None, _client=client)
+ repo = RemoteRepository(bzrdir, None, _client=client)
+ branch = RemoteBranch(bzrdir, repo, _client=client)
self.assertRaises(errors.UnlockableTransport, branch.lock_write)
self.assertEqual(
[('call', 'Branch.lock_write', ('quack/', '', ''))],
@@ -1182,3 +1186,143 @@
self.assertFalse(isinstance(dest_repo, RemoteRepository))
self.assertTrue(isinstance(src_repo, RemoteRepository))
src_repo.copy_content_into(dest_repo)
+
+
+class TestErrorTranslationBase(tests.TestCaseWithMemoryTransport):
+ """Base class for unit tests for bzrlib.remote._translate_error."""
+
+ def translateTuple(self, error_tuple, **context):
+ """Call _translate_error with an ErrorFromSmartServer built from the
+ given error_tuple.
+
+ :param error_tuple: A tuple of a smart server response, as would be
+ passed to an ErrorFromSmartServer.
+ :kwargs context: context items to call _translate_error with.
+
+ :returns: The error raised by _translate_error.
+ """
+ # Raise the ErrorFromSmartServer before passing it as an argument,
+ # because _translate_error may need to re-raise it with a bare 'raise'
+ # statement.
+ server_error = errors.ErrorFromSmartServer(error_tuple)
+ translated_error = self.translateErrorFromSmartServer(
+ server_error, **context)
+ return translated_error
+
+ def translateErrorFromSmartServer(self, error_object, **context):
+ """Like translateTuple, but takes an already constructed
+ ErrorFromSmartServer rather than a tuple.
+ """
+ try:
+ raise error_object
+ except errors.ErrorFromSmartServer, server_error:
+ translated_error = self.assertRaises(
+ errors.BzrError, remote._translate_error, server_error,
+ **context)
+ return translated_error
+
+
+class TestErrorTranslationSuccess(TestErrorTranslationBase):
+ """Unit tests for bzrlib.remote._translate_error.
+
+ Given an ErrorFromSmartServer (which has an error tuple from a smart
+ server) and some context, _translate_error raises more specific errors from
+ bzrlib.errors.
+
+ This test case covers the cases where _translate_error succeeds in
+ translating an ErrorFromSmartServer to something better. See
+ TestErrorTranslationRobustness for other cases.
+ """
+
+ def test_NoSuchRevision(self):
+ branch = self.make_branch('')
+ revid = 'revid'
+ translated_error = self.translateTuple(
+ ('NoSuchRevision', revid), branch=branch)
+ expected_error = errors.NoSuchRevision(branch, revid)
+ self.assertEqual(expected_error, translated_error)
+
+ def test_nosuchrevision(self):
+ repository = self.make_repository('')
+ revid = 'revid'
+ translated_error = self.translateTuple(
+ ('nosuchrevision', revid), repository=repository)
+ expected_error = errors.NoSuchRevision(repository, revid)
+ self.assertEqual(expected_error, translated_error)
+
+ def test_nobranch(self):
+ bzrdir = self.make_bzrdir('')
+ translated_error = self.translateTuple(('nobranch',), bzrdir=bzrdir)
+ expected_error = errors.NotBranchError(path=bzrdir.root_transport.base)
+ self.assertEqual(expected_error, translated_error)
+
+ def test_LockContention(self):
+ translated_error = self.translateTuple(('LockContention',))
+ expected_error = errors.LockContention('(remote lock)')
+ self.assertEqual(expected_error, translated_error)
+
+ def test_UnlockableTransport(self):
+ bzrdir = self.make_bzrdir('')
+ translated_error = self.translateTuple(
+ ('UnlockableTransport',), bzrdir=bzrdir)
+ expected_error = errors.UnlockableTransport(bzrdir.root_transport)
+ self.assertEqual(expected_error, translated_error)
+
+ def test_LockFailed(self):
+ lock = 'str() of a server lock'
+ why = 'str() of why'
+ translated_error = self.translateTuple(('LockFailed', lock, why))
+ expected_error = errors.LockFailed(lock, why)
+ self.assertEqual(expected_error, translated_error)
+
+ def test_TokenMismatch(self):
+ token = 'a lock token'
+ translated_error = self.translateTuple(('TokenMismatch',), token=token)
+ expected_error = errors.TokenMismatch(token, '(remote token)')
+ self.assertEqual(expected_error, translated_error)
+
+ def test_Diverged(self):
+ branch = self.make_branch('a')
+ other_branch = self.make_branch('b')
+ translated_error = self.translateTuple(
+ ('Diverged',), branch=branch, other_branch=other_branch)
+ expected_error = errors.DivergedBranches(branch, other_branch)
+ self.assertEqual(expected_error, translated_error)
+
+
+class TestErrorTranslationRobustness(TestErrorTranslationBase):
+ """Unit tests for bzrlib.remote._translate_error's robustness.
+
+ TestErrorTranslationSuccess is for cases where _translate_error can
+ translate successfully. This class about how _translate_err behaves when
+ it fails to translate: it re-raises the original error.
+ """
+
+ def test_unrecognised_server_error(self):
+ """If the error code from the server is not recognised, the original
+ ErrorFromSmartServer is propagated unmodified.
+ """
+ error_tuple = ('An unknown error tuple',)
+ server_error = errors.ErrorFromSmartServer(error_tuple)
+ translated_error = self.translateErrorFromSmartServer(server_error)
+ self.assertEqual(server_error, translated_error)
+
+ def test_context_missing_a_key(self):
+ """In case of a bug in the client, or perhaps an unexpected response
+ from a server, _translate_error returns the original error tuple from
+ the server and mutters a warning.
+ """
+ # To translate a NoSuchRevision error _translate_error needs a 'branch'
+ # in the context dict. So let's give it an empty context dict instead
+ # to exercise its error recovery.
+ empty_context = {}
+ error_tuple = ('NoSuchRevision', 'revid')
+ server_error = errors.ErrorFromSmartServer(error_tuple)
+ translated_error = self.translateErrorFromSmartServer(server_error)
+ self.assertEqual(server_error, translated_error)
+ # In addition to re-raising ErrorFromSmartServer, some debug info has
+ # been muttered to the log file for developer to look at.
+ self.assertContainsRe(
+ self._get_log(keep_log_file=True),
+ "Missing key 'branch' in context")
+
More information about the bazaar-commits
mailing list