/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/test_fetch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-02-15 15:11:31 UTC
  • mfrom: (2230.3.55 branch6)
  • Revision ID: pqm@pqm.ubuntu.com-20070215151131-1f2ce67d76e40200
Provide new branch6 format

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
96
96
    br_a2.append_revision('a-b-c')
97
97
    self.assertRaises(bzrlib.errors.InstallFailed, br_a3.fetch, br_a2)
98
98
 
99
 
    # TODO: jam 20051218 Branch should no longer allow append_revision for revisions
100
 
    #       which don't exist. So this test needs to be rewritten
101
 
    #       RBC 20060403 the way to do this is to uncommit the revision from the
102
 
    #           repository after the commit
 
99
    # TODO: ADHB 20070116 Perhaps set_last_revision shouldn't accept
 
100
    #       revisions which are not present?  In that case, this test
 
101
    #       must be rewritten.
 
102
    #
 
103
    #       RBC 20060403 the way to do this is to uncommit the revision from
 
104
    #       the repository after the commit
103
105
 
104
106
    #TODO: test that fetch correctly does reweaving when needed. RBC 20051008
105
107
    # Note that this means - updating the weave when ghosts are filled in to 
272
274
        self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))
273
275
        # this r-h check test will prevent regressions, but it currently already 
274
276
        # passes, before the patch to cache-rh is applied :[
275
 
        self.assertEqual(1, self._count_log_matches('revision-history', http_logs))
 
277
        self.assertTrue(1 >= self._count_log_matches('revision-history',
 
278
                                                     http_logs))
 
279
        self.assertTrue(1 >= self._count_log_matches('last-revision',
 
280
                                                     http_logs))
276
281
        # FIXME naughty poking in there.
277
282
        self.get_readonly_server().logs = []
278
283
        # check there is nothing more to fetch
285
290
        self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
286
291
        self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
287
292
        self.assertEqual(1, self._count_log_matches('repository/format', http_logs))
288
 
        self.assertEqual(1, self._count_log_matches('revision-history', http_logs))
 
293
        self.assertTrue(1 >= self._count_log_matches('revision-history',
 
294
                                                     http_logs))
 
295
        self.assertTrue(1 >= self._count_log_matches('last-revision',
 
296
                                                     http_logs))
289
297
        self.assertEqual(4, len(http_logs))