← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2011-04-08 03:31:54 UTC
  • mfrom: (5766 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5767.
  • Revision ID: andrew.bennetts@canonical.com-20110408033154-la08nghd4391sw5m
Merge latest lp:bzr, move our new release notes entries to the current release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/test_fetch.py
451
451
    def test_fetch_missing_revision_same_location_fails(self):
452
452
        repo_a = self.make_repository('.')
453
453
        repo_b = repository.Repository.open('.')
454
 
        try:
455
 
            self.assertRaises(errors.NoSuchRevision, repo_b.fetch, repo_a, revision_id='XXX')
456
 
        except errors.LockError, e:
457
 
            check_old_format_lock_error(self.repository_format)
 
454
        self.assertRaises(errors.NoSuchRevision,
 
455
            repo_b.fetch, repo_a, revision_id='XXX')
458
456
 
459
457
    def test_fetch_same_location_trivial_works(self):
460
458
        repo_a = self.make_repository('.')
461
459
        repo_b = repository.Repository.open('.')
462
 
        try:
463
 
            repo_a.fetch(repo_b)
464
 
        except errors.LockError, e:
465
 
            check_old_format_lock_error(self.repository_format)
 
460
        repo_a.fetch(repo_b)
466
461
 
467
462
    def test_fetch_missing_text_other_location_fails(self):
468
463
        source_tree = self.make_branch_and_tree('source')