← 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: Martin Pool
  • Date: 2006-01-30 06:23:50 UTC
  • mfrom: (1534.1.17 integration)
  • Revision ID: mbp@sourcefrog.net-20060130062350-d6f25277ddcdfd79
[merge] robert's integration of much recent work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
17
17
import os
18
18
import sys
19
19
 
 
20
from bzrlib.branch import Branch
 
21
from bzrlib.builtins import merge
20
22
import bzrlib.errors
21
 
from bzrlib.selftest.testrevision import make_branches
 
23
from bzrlib.fetch import greedy_fetch
 
24
from bzrlib.tests.test_revision import make_branches
 
25
from bzrlib.tests import TestCaseInTempDir
 
26
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
22
27
from bzrlib.trace import mutter
23
 
from bzrlib.branch import Branch
24
 
from bzrlib.fetch import greedy_fetch
25
 
 
26
 
from bzrlib.selftest import TestCaseInTempDir
27
 
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
28
28
 
29
29
 
30
30
def has_revision(branch, revision_id):
31
31
    try:
32
 
        branch.get_revision_xml_file(revision_id)
 
32
        branch.repository.get_revision_xml_file(revision_id)
33
33
        return True
34
34
    except bzrlib.errors.NoSuchRevision:
35
35
        return False
40
40
        os.mkdir(name)
41
41
        return Branch.initialize(name)
42
42
            
43
 
    assert not has_revision(br_b, br_a.revision_history()[3])
44
 
    assert has_revision(br_b, br_a.revision_history()[2])
45
 
    assert len(br_b.revision_history()) == 7
46
 
    assert greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0] == 0
 
43
    self.assertFalse(has_revision(br_b, br_a.revision_history()[3]))
 
44
    self.assert_(has_revision(br_b, br_a.revision_history()[2]))
 
45
    self.assertEquals(len(br_b.revision_history()), 7)
 
46
    self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0], 0)
47
47
 
48
48
    # greedy_fetch is not supposed to alter the revision history
49
 
    assert len(br_b.revision_history()) == 7
50
 
    assert not has_revision(br_b, br_a.revision_history()[3])
 
49
    self.assertEquals(len(br_b.revision_history()), 7)
 
50
    self.assertFalse(has_revision(br_b, br_a.revision_history()[3]))
51
51
 
52
 
    assert len(br_b.revision_history()) == 7
53
 
    assert greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0] == 1
54
 
    assert has_revision(br_b, br_a.revision_history()[3])
55
 
    assert not has_revision(br_a, br_b.revision_history()[6])
56
 
    assert has_revision(br_a, br_b.revision_history()[5])
 
52
    self.assertEquals(len(br_b.revision_history()), 7)
 
53
    self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0], 1)
 
54
    self.assert_(has_revision(br_b, br_a.revision_history()[3]))
 
55
    self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
 
56
    self.assert_(has_revision(br_a, br_b.revision_history()[5]))
57
57
 
58
58
    # When a non-branch ancestor is missing, it should be unlisted...
59
59
    # as its not reference from the inventory weave.
63
63
    self.assertEqual(failures, [])
64
64
 
65
65
    self.assertEqual(greedy_fetch(writable_a, br_b)[0], 1)
66
 
    assert has_revision(br_a, br_b.revision_history()[3])
67
 
    assert has_revision(br_a, br_b.revision_history()[4])
 
66
    self.assert_(has_revision(br_a, br_b.revision_history()[3]))
 
67
    self.assert_(has_revision(br_a, br_b.revision_history()[4]))
68
68
        
69
69
    br_b2 = new_branch('br_b2')
70
 
    assert greedy_fetch(br_b2, br_b)[0] == 7
71
 
    assert has_revision(br_b2, br_b.revision_history()[4])
72
 
    assert has_revision(br_b2, br_a.revision_history()[2])
73
 
    assert not has_revision(br_b2, br_a.revision_history()[3])
 
70
    self.assertEquals(greedy_fetch(br_b2, br_b)[0], 7)
 
71
    self.assert_(has_revision(br_b2, br_b.revision_history()[4]))
 
72
    self.assert_(has_revision(br_b2, br_a.revision_history()[2]))
 
73
    self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
74
74
 
75
75
    br_a2 = new_branch('br_a2')
76
 
    assert greedy_fetch(br_a2, br_a)[0] == 9
77
 
    assert has_revision(br_a2, br_b.revision_history()[4])
78
 
    assert has_revision(br_a2, br_a.revision_history()[3])
79
 
    assert has_revision(br_a2, br_a.revision_history()[2])
 
76
    self.assertEquals(greedy_fetch(br_a2, br_a)[0], 9)
 
77
    self.assert_(has_revision(br_a2, br_b.revision_history()[4]))
 
78
    self.assert_(has_revision(br_a2, br_a.revision_history()[3]))
 
79
    self.assert_(has_revision(br_a2, br_a.revision_history()[2]))
80
80
 
81
81
    br_a3 = new_branch('br_a3')
82
 
    assert greedy_fetch(br_a3, br_a2)[0] == 0
 
82
    self.assertEquals(greedy_fetch(br_a3, br_a2)[0], 0)
83
83
    for revno in range(4):
84
 
        assert not has_revision(br_a3, br_a.revision_history()[revno])
 
84
        self.assertFalse(has_revision(br_a3, br_a.revision_history()[revno]))
85
85
    self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
86
86
    fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
87
 
    assert fetched == 3, "fetched %d instead of 3" % fetched
 
87
    self.assertEquals(fetched, 6, "fetched %d instead of 6" % fetched)
88
88
    # InstallFailed should be raised if the branch is missing the revision
89
89
    # that was requested.
90
90
    self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
102
102
 
103
103
    def test_fetch(self):
104
104
        #highest indices a: 5, b: 7
105
 
        br_a, br_b = make_branches()
 
105
        br_a, br_b = make_branches(self)
106
106
        fetch_steps(self, br_a, br_b, br_a)
107
107
 
108
108
 
 
109
class TestMergeFetch(TestCaseInTempDir):
 
110
 
 
111
    def test_merge_fetches_unrelated(self):
 
112
        """Merge brings across history from unrelated source"""
 
113
        os.mkdir('br1')
 
114
        br1 = Branch.initialize('br1')
 
115
        br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
 
116
        br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
 
117
        os.mkdir('br2')
 
118
        br2 = Branch.initialize('br2')
 
119
        br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
 
120
        merge(other_revision=['br1', -1], base_revision=['br1', 0],
 
121
              this_dir='br2')
 
122
        self._check_revs_present(br2)
 
123
 
 
124
    def test_merge_fetches(self):
 
125
        """Merge brings across history from source"""
 
126
        os.mkdir('br1')
 
127
        br1 = Branch.initialize('br1')
 
128
        br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
 
129
        br1.clone('br2')
 
130
        br2 = Branch.open('br2')
 
131
        br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
 
132
        br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
 
133
        merge(other_revision=['br1', -1], base_revision=[None, None], 
 
134
              this_dir='br2')
 
135
        self._check_revs_present(br2)
 
136
 
 
137
    def _check_revs_present(self, br2):
 
138
        for rev_id in '1-1', '1-2', '2-1':
 
139
            self.assertTrue(br2.repository.has_revision(rev_id))
 
140
            rev = br2.repository.get_revision(rev_id)
 
141
            self.assertEqual(rev.revision_id, rev_id)
 
142
            self.assertTrue(br2.repository.get_inventory(rev_id))
 
143
 
 
144
 
 
145
 
 
146
class TestMergeFileHistory(TestCaseInTempDir):
 
147
    def setUp(self):
 
148
        TestCaseInTempDir.setUp(self)
 
149
        os.mkdir('br1')
 
150
        br1 = Branch.initialize('br1')
 
151
        self.build_tree_contents([('br1/file', 'original contents\n')])
 
152
        br1.working_tree().add(['file'], ['this-file-id'])
 
153
        br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
 
154
        br1.clone('br2')
 
155
        br2 = Branch.open('br2')
 
156
        self.build_tree_contents([('br1/file', 'original from 1\n')])
 
157
        br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
 
158
        self.build_tree_contents([('br1/file', 'agreement\n')])
 
159
        br1.working_tree().commit(message='rev 1-3', rev_id='1-3')
 
160
        self.build_tree_contents([('br2/file', 'contents in 2\n')])
 
161
        br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
 
162
        self.build_tree_contents([('br2/file', 'agreement\n')])
 
163
        br2.working_tree().commit(message='rev 2-2', rev_id='2-2')
 
164
 
 
165
    def test_merge_fetches_file_history(self):
 
166
        """Merge brings across file histories"""
 
167
        br2 = Branch.open('br2')
 
168
        merge(other_revision=['br1', -1], base_revision=[None, None], 
 
169
              this_dir='br2')
 
170
        for rev_id, text in [('1-2', 'original from 1\n'),
 
171
                             ('1-3', 'agreement\n'),
 
172
                             ('2-1', 'contents in 2\n'),
 
173
                             ('2-2', 'agreement\n')]:
 
174
            self.assertEqualDiff(
 
175
                br2.repository.revision_tree(
 
176
                    rev_id).get_file_text('this-file-id'), text)
 
177
 
 
178
 
 
179
 
 
180
 
109
181
class TestHttpFetch(TestCaseWithWebserver):
110
182
 
111
 
    def setUp(self):
112
 
        super(TestHttpFetch, self).setUp()
113
 
        self.weblogs = []
114
 
 
115
183
    def test_fetch(self):
116
184
        #highest indices a: 5, b: 7
117
 
        br_a, br_b = make_branches()
118
 
        br_rem_a = Branch.open(self.get_remote_url(br_a._transport.base))
 
185
        br_a, br_b = make_branches(self)
 
186
        br_rem_a = Branch.open(self.get_remote_url(br_a.base))
119
187
        fetch_steps(self, br_rem_a, br_b, br_a)
120
188
 
121
 
    def log(self, *args):
122
 
        """Capture web server log messages for introspection."""
123
 
        super(TestHttpFetch, self).log(*args)
124
 
        if args[0].startswith("webserver"):
125
 
            self.weblogs.append(args[0])
126
 
 
127
189
    def test_weaves_are_retrieved_once(self):
128
190
        self.build_tree(("source/", "source/file", "target/"))
129
191
        branch = Branch.initialize("source")
130
 
        branch.add(["file"], ["id"])
131
 
        branch.commit("added file")
 
192
        branch.working_tree().add(["file"], ["id"])
 
193
        branch.working_tree().commit("added file")
132
194
        print >>open("source/file", 'w'), "blah"
133
 
        branch.commit("changed file")
 
195
        branch.working_tree().commit("changed file")
134
196
        target = Branch.initialize("target/")
135
197
        source = Branch.open(self.get_remote_url("source/"))
136
198
        self.assertEqual(greedy_fetch(target, source), (2, []))
139
201
        # path.
140
202
        weave_suffix = 'weaves/ce/id.weave HTTP/1.1" 200 -'
141
203
        self.assertEqual(1,
142
 
            len([log for log in self.weblogs if log.endswith(weave_suffix)]))
 
204
            len([log for log in self.server.logs if log.endswith(weave_suffix)]))
143
205
        inventory_weave_suffix = 'inventory.weave HTTP/1.1" 200 -'
144
206
        self.assertEqual(1,
145
 
            len([log for log in self.weblogs if log.endswith(
 
207
            len([log for log in self.server.logs if log.endswith(
146
208
                inventory_weave_suffix)]))
147
209
        # this r-h check test will prevent regressions, but it currently already 
148
210
        # passes, before the patch to cache-rh is applied :[
149
211
        revision_history_suffix = 'revision-history HTTP/1.1" 200 -'
150
212
        self.assertEqual(1,
151
 
            len([log for log in self.weblogs if log.endswith(
 
213
            len([log for log in self.server.logs if log.endswith(
152
214
                revision_history_suffix)]))
153
 
        self.weblogs = []
 
215
        # FIXME naughty poking in there.
 
216
        self.server.logs = []
154
217
        # check there is nothing more to fetch
155
218
        source = Branch.open(self.get_remote_url("source/"))
156
219
        self.assertEqual(greedy_fetch(target, source), (0, []))
157
 
        self.failUnless(self.weblogs[0].endswith('branch-format HTTP/1.1" 200 -'))
158
 
        self.failUnless(self.weblogs[1].endswith('revision-history HTTP/1.1" 200 -'))
159
 
        self.assertEqual(2, len(self.weblogs))
 
220
        self.failUnless(self.server.logs[0].endswith('branch-format HTTP/1.1" 200 -'))
 
221
        self.failUnless(self.server.logs[1].endswith('revision-history HTTP/1.1" 200 -'))
 
222
        self.assertEqual(2, len(self.server.logs))