/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/interrepository_implementations/test_fetch.py

1st cut merge of bzr.dev r3907

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/interrepository_implementations/test_fetch.py
36
36
from bzrlib.tests.interrepository_implementations import (
37
37
    TestCaseWithInterRepository,
38
38
    )
 
39
from bzrlib.tests.interrepository_implementations.test_interrepository import (
 
40
    check_repo_format_for_funky_id_on_win32
 
41
    )
39
42
 
40
43
 
41
44
class TestInterRepository(TestCaseWithInterRepository):
98
101
        # generally do).
99
102
        try:
100
103
            to_repo.fetch(tree.branch.repository, 'rev-two')
101
 
        except errors.RevisionNotPresent, e:
 
104
        except (errors.BzrCheckError, errors.RevisionNotPresent), e:
102
105
            # If an exception is raised, the revision should not be in the
103
106
            # target.
 
107
            # 
 
108
            # Can also just raise a generic check errors; stream insertion
 
109
            # does this to include all the missing data
104
110
            self.assertRaises((errors.NoSuchRevision, errors.RevisionNotPresent),
105
111
                              to_repo.revision_tree, 'rev-two')
106
112
        else: