← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testfetch.py

  • Committer: Aaron Bentley
  • Date: 2005-10-04 04:32:32 UTC
  • mfrom: (1185.12.6)
  • mto: (1185.12.13)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051004043231-40302a149769263b
merged my own changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testfetch.py
22
22
from bzrlib.trace import mutter
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.fetch import greedy_fetch
25
 
from bzrlib.merge import merge
26
 
from bzrlib.clone import copy_branch
27
25
 
28
26
from bzrlib.selftest import TestCaseInTempDir
29
 
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
30
27
 
31
28
 
32
29
def has_revision(branch, revision_id):
58
55
    assert has_revision(br_a, br_b.revision_history()[5])
59
56
 
60
57
    # When a non-branch ancestor is missing, it should be unlisted...
61
 
    # as its not reference from the inventory weave.
 
58
    # as its not present in the ancestry weave.
62
59
    br_b4 = new_branch('br_4')
63
60
    count, failures = greedy_fetch(br_b4, br_b)
64
61
    self.assertEqual(count, 7)
98
95
                      br_a2)
99
96
 
100
97
 
101
 
    #TODO: test that fetch correctly does reweaving when needed. RBC 20051008
102
 
 
103
98
class TestFetch(TestCaseInTempDir):
104
99
 
105
100
    def test_fetch(self):
 
101
        
106
102
        #highest indices a: 5, b: 7
107
103
        br_a, br_b = make_branches()
108
104
        fetch_steps(self, br_a, br_b, br_a)
109
 
 
110
 
 
111
 
class TestMergeFetch(TestCaseInTempDir):
112
 
 
113
 
    def test_merge_fetches_unrelated(self):
114
 
        """Merge brings across history from unrelated source"""
115
 
        os.mkdir('br1')
116
 
        br1 = Branch.initialize('br1')
117
 
        br1.commit(message='rev 1-1', rev_id='1-1')
118
 
        br1.commit(message='rev 1-2', rev_id='1-2')
119
 
        os.mkdir('br2')
120
 
        br2 = Branch.initialize('br2')
121
 
        br2.commit(message='rev 2-1', rev_id='2-1')
122
 
        merge(other_revision=['br1', -1], base_revision=['br1', 0],
123
 
              this_dir='br2')
124
 
        self._check_revs_present(br2)
125
 
 
126
 
    def test_merge_fetches(self):
127
 
        """Merge brings across history from source"""
128
 
        os.mkdir('br1')
129
 
        br1 = Branch.initialize('br1')
130
 
        br1.commit(message='rev 1-1', rev_id='1-1')
131
 
        copy_branch(br1, 'br2')
132
 
        br2 = Branch.open('br2')
133
 
        br1.commit(message='rev 1-2', rev_id='1-2')
134
 
        br2.commit(message='rev 2-1', rev_id='2-1')
135
 
        merge(other_revision=['br1', -1], base_revision=[None, None], 
136
 
              this_dir='br2')
137
 
        self._check_revs_present(br2)
138
 
 
139
 
    def _check_revs_present(self, br2):
140
 
        for rev_id in '1-1', '1-2', '2-1':
141
 
            self.assertTrue(br2.has_revision(rev_id))
142
 
            rev = br2.get_revision(rev_id)
143
 
            self.assertEqual(rev.revision_id, rev_id)
144
 
            self.assertTrue(br2.get_inventory(rev_id))
145
 
 
146
 
 
147
 
 
148
 
class TestMergeFileHistory(TestCaseInTempDir):
149
 
    def setUp(self):
150
 
        TestCaseInTempDir.setUp(self)
151
 
        os.mkdir('br1')
152
 
        br1 = Branch.initialize('br1')
153
 
        self.build_tree_contents([('br1/file', 'original contents\n')])
154
 
        br1.add(['file'], ['this-file-id'])
155
 
        br1.commit(message='rev 1-1', rev_id='1-1')
156
 
        copy_branch(br1, 'br2')
157
 
        br2 = Branch.open('br2')
158
 
        self.build_tree_contents([('br1/file', 'original from 1\n')])
159
 
        br1.commit(message='rev 1-2', rev_id='1-2')
160
 
        self.build_tree_contents([('br1/file', 'agreement\n')])
161
 
        br1.commit(message='rev 1-3', rev_id='1-3')
162
 
        self.build_tree_contents([('br2/file', 'contents in 2\n')])
163
 
        br2.commit(message='rev 2-1', rev_id='2-1')
164
 
        self.build_tree_contents([('br2/file', 'agreement\n')])
165
 
        br2.commit(message='rev 2-2', rev_id='2-2')
166
 
 
167
 
    def test_merge_fetches_file_history(self):
168
 
        """Merge brings across file histories"""
169
 
        br2 = Branch.open('br2')
170
 
        merge(other_revision=['br1', -1], base_revision=[None, None], 
171
 
              this_dir='br2')
172
 
        for rev_id, text in [('1-2', 'original from 1\n'),
173
 
                             ('1-3', 'agreement\n'),
174
 
                             ('2-1', 'contents in 2\n'),
175
 
                             ('2-2', 'agreement\n')]:
176
 
            self.assertEqualDiff(br2.revision_tree(rev_id).get_file_text('this-file-id'),
177
 
                                 text)
178
 
 
179
 
 
180
 
 
181
 
 
182
 
class TestHttpFetch(TestCaseWithWebserver):
183
 
 
184
 
    def setUp(self):
185
 
        super(TestHttpFetch, self).setUp()
186
 
        self.weblogs = []
187
 
 
188
 
    def test_fetch(self):
189
 
        #highest indices a: 5, b: 7
190
 
        br_a, br_b = make_branches()
191
 
        br_rem_a = Branch.open(self.get_remote_url(br_a._transport.base))
192
 
        fetch_steps(self, br_rem_a, br_b, br_a)
193
 
 
194
 
    def log(self, *args):
195
 
        """Capture web server log messages for introspection."""
196
 
        super(TestHttpFetch, self).log(*args)
197
 
        if args[0].startswith("webserver"):
198
 
            self.weblogs.append(args[0])
199
 
 
200
 
    def test_weaves_are_retrieved_once(self):
201
 
        self.build_tree(("source/", "source/file", "target/"))
202
 
        branch = Branch.initialize("source")
203
 
        branch.add(["file"], ["id"])
204
 
        branch.commit("added file")
205
 
        print >>open("source/file", 'w'), "blah"
206
 
        branch.commit("changed file")
207
 
        target = Branch.initialize("target/")
208
 
        source = Branch.open(self.get_remote_url("source/"))
209
 
        self.assertEqual(greedy_fetch(target, source), (2, []))
210
 
        # this is the path to the literal file. As format changes 
211
 
        # occur it needs to be updated. FIXME: ask the store for the
212
 
        # path.
213
 
        weave_suffix = 'weaves/ce/id.weave HTTP/1.1" 200 -'
214
 
        self.assertEqual(1,
215
 
            len([log for log in self.weblogs if log.endswith(weave_suffix)]))
216
 
        inventory_weave_suffix = 'inventory.weave HTTP/1.1" 200 -'
217
 
        self.assertEqual(1,
218
 
            len([log for log in self.weblogs if log.endswith(
219
 
                inventory_weave_suffix)]))
220
 
        # this r-h check test will prevent regressions, but it currently already 
221
 
        # passes, before the patch to cache-rh is applied :[
222
 
        revision_history_suffix = 'revision-history HTTP/1.1" 200 -'
223
 
        self.assertEqual(1,
224
 
            len([log for log in self.weblogs if log.endswith(
225
 
                revision_history_suffix)]))
226
 
        self.weblogs = []
227
 
        # check there is nothing more to fetch
228
 
        source = Branch.open(self.get_remote_url("source/"))
229
 
        self.assertEqual(greedy_fetch(target, source), (0, []))
230
 
        self.failUnless(self.weblogs[0].endswith('branch-format HTTP/1.1" 200 -'))
231
 
        self.failUnless(self.weblogs[1].endswith('revision-history HTTP/1.1" 200 -'))
232
 
        self.assertEqual(2, len(self.weblogs))