← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-10 17:52:08 UTC
  • mfrom: (5021 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100210175208-bubuwav4uqigu291
Merge bzr.dev 5021 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
import os
 
18
import re
 
19
import sys
 
20
 
 
21
import bzrlib
17
22
from bzrlib import (
18
23
    bzrdir,
19
24
    errors,
20
25
    osutils,
21
 
    revision as _mod_revision,
 
26
    merge,
 
27
    repository,
22
28
    versionedfile,
23
29
    )
24
30
from bzrlib.branch import Branch
 
31
from bzrlib.bzrdir import BzrDir
25
32
from bzrlib.repofmt import knitrepo
26
33
from bzrlib.tests import TestCaseWithTransport
 
34
from bzrlib.tests.http_utils import TestCaseWithWebserver
27
35
from bzrlib.tests.test_revision import make_branches
 
36
from bzrlib.trace import mutter
28
37
from bzrlib.upgrade import Convert
29
38
from bzrlib.workingtree import WorkingTree
30
39
 
36
45
def has_revision(branch, revision_id):
37
46
    return branch.repository.has_revision(revision_id)
38
47
 
39
 
 
40
 
def revision_history(branch):
41
 
    branch.lock_read()
42
 
    try:
43
 
        graph = branch.repository.get_graph()
44
 
        history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
45
 
            [_mod_revision.NULL_REVISION]))
46
 
    finally:
47
 
        branch.unlock()
48
 
    history.reverse()
49
 
    return history
50
 
 
51
 
 
52
48
def fetch_steps(self, br_a, br_b, writable_a):
53
49
    """A foreign test method for testing fetch locally and remotely."""
54
50
 
55
51
    # TODO RBC 20060201 make this a repository test.
56
52
    repo_b = br_b.repository
57
 
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
58
 
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[2]))
59
 
    self.assertEquals(len(revision_history(br_b)), 7)
60
 
    br_b.fetch(br_a, revision_history(br_a)[2])
 
53
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
 
54
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
 
55
    self.assertEquals(len(br_b.revision_history()), 7)
 
56
    br_b.fetch(br_a, br_a.revision_history()[2])
61
57
    # branch.fetch is not supposed to alter the revision history
62
 
    self.assertEquals(len(revision_history(br_b)), 7)
63
 
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
 
58
    self.assertEquals(len(br_b.revision_history()), 7)
 
59
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
64
60
 
65
61
    # fetching the next revision up in sample data copies one revision
66
 
    br_b.fetch(br_a, revision_history(br_a)[3])
67
 
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[3]))
68
 
    self.assertFalse(has_revision(br_a, revision_history(br_b)[6]))
69
 
    self.assertTrue(br_a.repository.has_revision(revision_history(br_b)[5]))
 
62
    br_b.fetch(br_a, br_a.revision_history()[3])
 
63
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
 
64
    self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
 
65
    self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
70
66
 
71
67
    # When a non-branch ancestor is missing, it should be unlisted...
72
68
    # as its not reference from the inventory weave.
74
70
    br_b4.fetch(br_b)
75
71
 
76
72
    writable_a.fetch(br_b)
77
 
    self.assertTrue(has_revision(br_a, revision_history(br_b)[3]))
78
 
    self.assertTrue(has_revision(br_a, revision_history(br_b)[4]))
 
73
    self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
 
74
    self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
79
75
 
80
76
    br_b2 = self.make_branch('br_b2')
81
77
    br_b2.fetch(br_b)
82
 
    self.assertTrue(has_revision(br_b2, revision_history(br_b)[4]))
83
 
    self.assertTrue(has_revision(br_b2, revision_history(br_a)[2]))
84
 
    self.assertFalse(has_revision(br_b2, revision_history(br_a)[3]))
 
78
    self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
 
79
    self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
 
80
    self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
85
81
 
86
82
    br_a2 = self.make_branch('br_a2')
87
83
    br_a2.fetch(br_a)
88
 
    self.assertTrue(has_revision(br_a2, revision_history(br_b)[4]))
89
 
    self.assertTrue(has_revision(br_a2, revision_history(br_a)[3]))
90
 
    self.assertTrue(has_revision(br_a2, revision_history(br_a)[2]))
 
84
    self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
 
85
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
 
86
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
91
87
 
92
88
    br_a3 = self.make_branch('br_a3')
93
89
    # pulling a branch with no revisions grabs nothing, regardless of
95
91
    br_a3.fetch(br_a2)
96
92
    for revno in range(4):
97
93
        self.assertFalse(
98
 
            br_a3.repository.has_revision(revision_history(br_a)[revno]))
99
 
    br_a3.fetch(br_a2, revision_history(br_a)[2])
 
94
            br_a3.repository.has_revision(br_a.revision_history()[revno]))
 
95
    br_a3.fetch(br_a2, br_a.revision_history()[2])
100
96
    # pull the 3 revisions introduced by a@u-0-3
101
 
    br_a3.fetch(br_a2, revision_history(br_a)[3])
 
97
    br_a3.fetch(br_a2, br_a.revision_history()[3])
102
98
    # NoSuchRevision should be raised if the branch is missing the revision
103
99
    # that was requested.
104
100
    self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')
252
248
                    rev_id).get_file_text('this-file-id'), text)
253
249
 
254
250
 
 
251
class TestHttpFetch(TestCaseWithWebserver):
 
252
    # FIXME RBC 20060124 this really isn't web specific, perhaps an
 
253
    # instrumented readonly transport? Can we do an instrumented
 
254
    # adapter and use self.get_readonly_url ?
 
255
 
 
256
    def test_fetch(self):
 
257
        #highest indices a: 5, b: 7
 
258
        br_a, br_b = make_branches(self)
 
259
        br_rem_a = Branch.open(self.get_readonly_url('branch1'))
 
260
        fetch_steps(self, br_rem_a, br_b, br_a)
 
261
 
 
262
    def _count_log_matches(self, target, logs):
 
263
        """Count the number of times the target file pattern was fetched in an http log"""
 
264
        get_succeeds_re = re.compile(
 
265
            '.*"GET .*%s HTTP/1.1" 20[06] - "-" "bzr/%s' %
 
266
            (     target,                    bzrlib.__version__))
 
267
        c = 0
 
268
        for line in logs:
 
269
            if get_succeeds_re.match(line):
 
270
                c += 1
 
271
        return c
 
272
 
 
273
    def test_weaves_are_retrieved_once(self):
 
274
        self.build_tree(("source/", "source/file", "target/"))
 
275
        # This test depends on knit dasta storage.
 
276
        wt = self.make_branch_and_tree('source', format='dirstate-tags')
 
277
        branch = wt.branch
 
278
        wt.add(["file"], ["id"])
 
279
        wt.commit("added file")
 
280
        open("source/file", 'w').write("blah\n")
 
281
        wt.commit("changed file")
 
282
        target = BzrDir.create_branch_and_repo("target/")
 
283
        source = Branch.open(self.get_readonly_url("source/"))
 
284
        target.fetch(source)
 
285
        # this is the path to the literal file. As format changes
 
286
        # occur it needs to be updated. FIXME: ask the store for the
 
287
        # path.
 
288
        self.log("web server logs are:")
 
289
        http_logs = self.get_readonly_server().logs
 
290
        self.log('\n'.join(http_logs))
 
291
        # unfortunately this log entry is branch format specific. We could
 
292
        # factor out the 'what files does this format use' to a method on the
 
293
        # repository, which would let us to this generically. RBC 20060419
 
294
        # RBC 20080408: Or perhaps we can assert that no files are fully read
 
295
        # twice?
 
296
        self.assertEqual(1, self._count_log_matches('/ce/id.kndx', http_logs))
 
297
        self.assertEqual(1, self._count_log_matches('/ce/id.knit', http_logs))
 
298
        self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))
 
299
        # this r-h check test will prevent regressions, but it currently already
 
300
        # passes, before the patch to cache-rh is applied :[
 
301
        self.assertTrue(1 >= self._count_log_matches('revision-history',
 
302
                                                     http_logs))
 
303
        self.assertTrue(1 >= self._count_log_matches('last-revision',
 
304
                                                     http_logs))
 
305
        # FIXME naughty poking in there.
 
306
        self.get_readonly_server().logs = []
 
307
        # check there is nothing more to fetch.  We take care to re-use the
 
308
        # existing transport so that the request logs we're about to examine
 
309
        # aren't cluttered with redundant probes for a smart server.
 
310
        # XXX: Perhaps this further parameterisation: test http with smart
 
311
        # server, and test http without smart server?
 
312
        source = Branch.open(
 
313
            self.get_readonly_url("source/"),
 
314
            possible_transports=[source.bzrdir.root_transport])
 
315
        target.fetch(source)
 
316
        # should make just two requests
 
317
        http_logs = self.get_readonly_server().logs
 
318
        self.log("web server logs are:")
 
319
        self.log('\n'.join(http_logs))
 
320
        self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
 
321
        self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
 
322
        self.assertEqual(1, self._count_log_matches('repository/format',
 
323
            http_logs))
 
324
        self.assertEqual(1, self._count_log_matches('revisions.kndx',
 
325
            http_logs))
 
326
        self.assertTrue(1 >= self._count_log_matches('revision-history',
 
327
                                                     http_logs))
 
328
        self.assertTrue(1 >= self._count_log_matches('last-revision',
 
329
                                                     http_logs))
 
330
        self.assertLength(5, http_logs)
 
331
 
 
332
 
255
333
class TestKnitToPackFetch(TestCaseWithTransport):
256
334
 
257
335
    def find_get_record_stream(self, calls, expected_count=1):