/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

  • Committer: Andrew Bennetts
  • Date: 2008-11-27 06:29:56 UTC
  • mfrom: (3861 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3863.
  • Revision ID: andrew.bennetts@canonical.com-20081127062956-v0a19icwk85iosx4
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

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