← Back to branch summary

~abentley/bzr/status

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

  • Committer: Aaron Bentley
  • Date: 2009-05-05 18:16:33 UTC
  • mfrom: (1731.1744.1078 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1931.
  • Revision ID: aaron@aaronbentley.com-20090505181633-3qtq1skwjzed0kug
Merge bzr.dev into composite-tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
95
95
    br_a3.fetch(br_a2, br_a.revision_history()[2])
96
96
    # pull the 3 revisions introduced by a@u-0-3
97
97
    br_a3.fetch(br_a2, br_a.revision_history()[3])
98
 
    # InstallFailed should be raised if the branch is missing the revision
 
98
    # NoSuchRevision should be raised if the branch is missing the revision
99
99
    # that was requested.
100
 
    self.assertRaises(errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
 
100
    self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')
101
101
 
102
102
    # TODO: Test trying to fetch from a branch that points to a revision not
103
103
    # actually present in its repository.  Not every branch format allows you
321
321
        self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
322
322
        self.assertEqual(1, self._count_log_matches('repository/format',
323
323
            http_logs))
 
324
        self.assertEqual(1, self._count_log_matches('revisions.kndx',
 
325
            http_logs))
324
326
        self.assertTrue(1 >= self._count_log_matches('revision-history',
325
327
                                                     http_logs))
326
328
        self.assertTrue(1 >= self._count_log_matches('last-revision',
327
329
                                                     http_logs))
328
 
        self.assertEqual(4, len(http_logs))
 
330
        self.assertLength(5, http_logs)
329
331
 
330
332
 
331
333
class TestKnitToPackFetch(TestCaseWithTransport):