/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: Andrew Bennetts
  • Date: 2008-04-10 07:58:01 UTC
  • mfrom: (3352 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3357.
  • Revision ID: andrew.bennetts@canonical.com-20080410075801-n24st9wfiizkvszp
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
285
285
        # unfortunately this log entry is branch format specific. We could 
286
286
        # factor out the 'what files does this format use' to a method on the 
287
287
        # repository, which would let us to this generically. RBC 20060419
 
288
        # RBC 20080408: Or perhaps we can assert that no files are fully read
 
289
        # twice?
288
290
        self.assertEqual(1, self._count_log_matches('/ce/id.kndx', http_logs))
289
291
        self.assertEqual(1, self._count_log_matches('/ce/id.knit', http_logs))
290
 
        self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))
 
292
        # XXX: This *should* be '1', but more intrusive fetch changes are
 
293
        # needed to drop this back to 1.
 
294
        self.assertEqual(2, self._count_log_matches('inventory.kndx', http_logs))
291
295
        # this r-h check test will prevent regressions, but it currently already 
292
296
        # passes, before the patch to cache-rh is applied :[
293
297
        self.assertTrue(1 >= self._count_log_matches('revision-history',
296
300
                                                     http_logs))
297
301
        # FIXME naughty poking in there.
298
302
        self.get_readonly_server().logs = []
299
 
        # check there is nothing more to fetch
300
 
        source = Branch.open(self.get_readonly_url("source/"))
 
303
        # check there is nothing more to fetch.  We take care to re-use the
 
304
        # existing transport so that the request logs we're about to examine
 
305
        # aren't cluttered with redundant probes for a smart server.
 
306
        # XXX: Perhaps this further parameterisation: test http with smart
 
307
        # server, and test http without smart server?
 
308
        source = Branch.open(
 
309
            self.get_readonly_url("source/"),
 
310
            possible_transports=[source.bzrdir.root_transport])
301
311
        self.assertEqual(target.fetch(source), (0, []))
302
312
        # should make just two requests
303
313
        http_logs = self.get_readonly_server().logs
305
315
        self.log('\n'.join(http_logs))
306
316
        self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
307
317
        self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
308
 
        self.assertEqual(1, self._count_log_matches('repository/format', http_logs))
 
318
        self.assertEqual(1, self._count_log_matches('repository/format',
 
319
            http_logs))
309
320
        self.assertTrue(1 >= self._count_log_matches('revision-history',
310
321
                                                     http_logs))
311
322
        self.assertTrue(1 >= self._count_log_matches('last-revision',