/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1115 by Martin Pool
- split fetch tests into a separate file
1
# Copyright (C) 2005 by Canonical Ltd
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
1238 by Martin Pool
- remove a lot of dead code from fetch
16
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
17
import os
1238 by Martin Pool
- remove a lot of dead code from fetch
18
import sys
19
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
20
from bzrlib.branch import Branch
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
21
from bzrlib.bzrdir import BzrDir
1534.1.16 by Robert Collins
Merge from jam-integration.
22
from bzrlib.builtins import merge
1115 by Martin Pool
- split fetch tests into a separate file
23
import bzrlib.errors
1534.1.16 by Robert Collins
Merge from jam-integration.
24
from bzrlib.fetch import greedy_fetch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
25
from bzrlib.tests import TestCaseWithTransport
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
26
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
27
from bzrlib.tests.test_revision import make_branches
28
from bzrlib.trace import mutter
29
from bzrlib.workingtree import WorkingTree
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
30
1115 by Martin Pool
- split fetch tests into a separate file
31
1238 by Martin Pool
- remove a lot of dead code from fetch
32
def has_revision(branch, revision_id):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
33
    return branch.repository.has_revision(revision_id)
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
34
1393 by Robert Collins
reenable remotebranch tests
35
def fetch_steps(self, br_a, br_b, writable_a):
36
    """A foreign test method for testing fetch locally and remotely."""
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
37
     
38
    # TODO RBC 20060201 make this a repository test.
39
    repo_b = br_b.repository
40
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
41
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
42
    self.assertEquals(len(br_b.revision_history()), 7)
43
    self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0], 0)
1393 by Robert Collins
reenable remotebranch tests
44
    # greedy_fetch is not supposed to alter the revision history
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
45
    self.assertEquals(len(br_b.revision_history()), 7)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
46
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
1393 by Robert Collins
reenable remotebranch tests
47
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
48
    # fetching the next revision up in sample data copies one revision
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
49
    self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0], 1)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
50
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
51
    self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
52
    self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
1393 by Robert Collins
reenable remotebranch tests
53
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
54
    # When a non-branch ancestor is missing, it should be unlisted...
1415 by Robert Collins
remove the ancestry weave file
55
    # as its not reference from the inventory weave.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
56
    br_b4 = self.make_branch('br_4')
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
57
    count, failures = greedy_fetch(br_b4, br_b)
58
    self.assertEqual(count, 7)
59
    self.assertEqual(failures, [])
1393 by Robert Collins
reenable remotebranch tests
60
61
    self.assertEqual(greedy_fetch(writable_a, br_b)[0], 1)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
62
    self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
63
    self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
1393 by Robert Collins
reenable remotebranch tests
64
        
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
65
    br_b2 = self.make_branch('br_b2')
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
66
    self.assertEquals(greedy_fetch(br_b2, br_b)[0], 7)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
67
    self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
68
    self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
69
    self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
1393 by Robert Collins
reenable remotebranch tests
70
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
71
    br_a2 = self.make_branch('br_a2')
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
72
    self.assertEquals(greedy_fetch(br_a2, br_a)[0], 9)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
73
    self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
74
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
75
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
1393 by Robert Collins
reenable remotebranch tests
76
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
77
    br_a3 = self.make_branch('br_a3')
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
78
    # pulling a branch with no revisions grabs nothing, regardless of 
79
    # whats in the inventory.
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
80
    self.assertEquals(greedy_fetch(br_a3, br_a2)[0], 0)
1393 by Robert Collins
reenable remotebranch tests
81
    for revno in range(4):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
82
        self.assertFalse(
83
            br_a3.repository.has_revision(br_a.revision_history()[revno]))
1393 by Robert Collins
reenable remotebranch tests
84
    self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
85
    # pull the 3 revisions introduced by a@u-0-3
1393 by Robert Collins
reenable remotebranch tests
86
    fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
87
    self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
1393 by Robert Collins
reenable remotebranch tests
88
    # InstallFailed should be raised if the branch is missing the revision
89
    # that was requested.
90
    self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
91
                      br_a2, 'pizza')
92
    # InstallFailed should be raised if the branch is missing a revision
93
    # from its own revision history
94
    br_a2.append_revision('a-b-c')
95
    self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
96
                      br_a2)
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
97
    #TODO: test that fetch correctly does reweaving when needed. RBC 20051008
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
98
    # Note that this means - updating the weave when ghosts are filled in to 
99
    # add the right parents.
100
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
101
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
102
class TestFetch(TestCaseWithTransport):
1392 by Robert Collins
reinstate testfetch test case
103
104
    def test_fetch(self):
1115 by Martin Pool
- split fetch tests into a separate file
105
        #highest indices a: 5, b: 7
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
106
        br_a, br_b = make_branches(self)
1393 by Robert Collins
reenable remotebranch tests
107
        fetch_steps(self, br_a, br_b, br_a)
1404 by Robert Collins
only pull remote text weaves once per fetch operation
108
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
109
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
110
class TestMergeFetch(TestCaseWithTransport):
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
111
112
    def test_merge_fetches_unrelated(self):
113
        """Merge brings across history from unrelated source"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
114
        wt1 = self.make_branch_and_tree('br1')
115
        br1 = wt1.branch
116
        wt1.commit(message='rev 1-1', rev_id='1-1')
117
        wt1.commit(message='rev 1-2', rev_id='1-2')
118
        wt2 = self.make_branch_and_tree('br2')
119
        br2 = wt2.branch
120
        wt2.commit(message='rev 2-1', rev_id='2-1')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
121
        merge(other_revision=['br1', -1], base_revision=['br1', 0],
122
              this_dir='br2')
123
        self._check_revs_present(br2)
124
1185.16.94 by mbp at sourcefrog
New test that merge fetches revisions from source
125
    def test_merge_fetches(self):
126
        """Merge brings across history from source"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
127
        wt1 = self.make_branch_and_tree('br1')
128
        br1 = wt1.branch
129
        wt1.commit(message='rev 1-1', rev_id='1-1')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
130
        dir_2 = br1.bzrdir.sprout('br2')
131
        br2 = dir_2.open_branch()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
132
        wt1.commit(message='rev 1-2', rev_id='1-2')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
133
        dir_2.open_workingtree().commit(message='rev 2-1', rev_id='2-1')
1185.16.94 by mbp at sourcefrog
New test that merge fetches revisions from source
134
        merge(other_revision=['br1', -1], base_revision=[None, None], 
135
              this_dir='br2')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
136
        self._check_revs_present(br2)
137
138
    def _check_revs_present(self, br2):
1185.16.94 by mbp at sourcefrog
New test that merge fetches revisions from source
139
        for rev_id in '1-1', '1-2', '2-1':
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
140
            self.assertTrue(br2.repository.has_revision(rev_id))
141
            rev = br2.repository.get_revision(rev_id)
1185.16.94 by mbp at sourcefrog
New test that merge fetches revisions from source
142
            self.assertEqual(rev.revision_id, rev_id)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
143
            self.assertTrue(br2.repository.get_inventory(rev_id))
1185.16.94 by mbp at sourcefrog
New test that merge fetches revisions from source
144
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
145
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
146
class TestMergeFileHistory(TestCaseWithTransport):
147
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
148
    def setUp(self):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
149
        super(TestMergeFileHistory, self).setUp()
150
        wt1 = self.make_branch_and_tree('br1')
151
        br1 = wt1.branch
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
152
        self.build_tree_contents([('br1/file', 'original contents\n')])
1534.4.28 by Robert Collins
first cut at merge from integration.
153
        wt1.add('file', 'this-file-id')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
154
        wt1.commit(message='rev 1-1', rev_id='1-1')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
155
        dir_2 = br1.bzrdir.sprout('br2')
156
        br2 = dir_2.open_branch()
157
        wt2 = dir_2.open_workingtree()
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
158
        self.build_tree_contents([('br1/file', 'original from 1\n')])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
159
        wt1.commit(message='rev 1-2', rev_id='1-2')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
160
        self.build_tree_contents([('br1/file', 'agreement\n')])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
161
        wt1.commit(message='rev 1-3', rev_id='1-3')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
162
        self.build_tree_contents([('br2/file', 'contents in 2\n')])
1534.4.28 by Robert Collins
first cut at merge from integration.
163
        wt2.commit(message='rev 2-1', rev_id='2-1')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
164
        self.build_tree_contents([('br2/file', 'agreement\n')])
1534.4.28 by Robert Collins
first cut at merge from integration.
165
        wt2.commit(message='rev 2-2', rev_id='2-2')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
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')]:
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
176
            self.assertEqualDiff(
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
177
                br2.repository.revision_tree(
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
178
                    rev_id).get_file_text('this-file-id'), text)
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
179
180
1404 by Robert Collins
only pull remote text weaves once per fetch operation
181
class TestHttpFetch(TestCaseWithWebserver):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
182
    # FIXME RBC 20060124 this really isn't web specific, perhaps an
183
    # instrumented readonly transport? Can we do an instrumented
184
    # adapter and use self.get_readonly_url ?
1404 by Robert Collins
only pull remote text weaves once per fetch operation
185
186
    def test_fetch(self):
187
        #highest indices a: 5, b: 7
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
188
        br_a, br_b = make_branches(self)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
189
        br_rem_a = Branch.open(self.get_readonly_url('branch1'))
1404 by Robert Collins
only pull remote text weaves once per fetch operation
190
        fetch_steps(self, br_rem_a, br_b, br_a)
191
192
    def test_weaves_are_retrieved_once(self):
193
        self.build_tree(("source/", "source/file", "target/"))
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
194
        wt = self.make_branch_and_tree('source')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
195
        branch = wt.branch
196
        wt.add(["file"], ["id"])
197
        wt.commit("added file")
1404 by Robert Collins
only pull remote text weaves once per fetch operation
198
        print >>open("source/file", 'w'), "blah"
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
199
        wt.commit("changed file")
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
200
        target = BzrDir.create_branch_and_repo("target/")
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
201
        source = Branch.open(self.get_readonly_url("source/"))
1404 by Robert Collins
only pull remote text weaves once per fetch operation
202
        self.assertEqual(greedy_fetch(target, source), (2, []))
1430 by Robert Collins
touchup the prefixed-store patch
203
        # this is the path to the literal file. As format changes 
204
        # occur it needs to be updated. FIXME: ask the store for the
205
        # path.
206
        weave_suffix = 'weaves/ce/id.weave HTTP/1.1" 200 -'
1404 by Robert Collins
only pull remote text weaves once per fetch operation
207
        self.assertEqual(1,
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
208
            len([log for log in self.get_readonly_server().logs if log.endswith(weave_suffix)]))
1437 by Robert Collins
lock during fetch, which is a separate code path to the special case of cloning
209
        inventory_weave_suffix = 'inventory.weave HTTP/1.1" 200 -'
210
        self.assertEqual(1,
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
211
            len([log for log in self.get_readonly_server().logs if log.endswith(
1437 by Robert Collins
lock during fetch, which is a separate code path to the special case of cloning
212
                inventory_weave_suffix)]))
1417.1.12 by Robert Collins
cache revision history during read transactions
213
        # this r-h check test will prevent regressions, but it currently already 
214
        # passes, before the patch to cache-rh is applied :[
215
        revision_history_suffix = 'revision-history HTTP/1.1" 200 -'
216
        self.assertEqual(1,
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
217
            len([log for log in self.get_readonly_server().logs if log.endswith(
1417.1.12 by Robert Collins
cache revision history during read transactions
218
                revision_history_suffix)]))
1530.1.18 by Robert Collins
unbreak test_fetch
219
        # FIXME naughty poking in there.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
220
        self.get_readonly_server().logs = []
1417.1.13 by Robert Collins
do not download remote ancestry.weave if the target revision we are stopping at is in our local store
221
        # check there is nothing more to fetch
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
222
        source = Branch.open(self.get_readonly_url("source/"))
1417.1.13 by Robert Collins
do not download remote ancestry.weave if the target revision we are stopping at is in our local store
223
        self.assertEqual(greedy_fetch(target, source), (0, []))
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
224
        self.failUnless(self.get_readonly_server().logs[0].endswith('branch-format HTTP/1.1" 200 -'))
225
        self.failUnless(self.get_readonly_server().logs[1].endswith('revision-history HTTP/1.1" 200 -'))
226
        self.assertEqual(2, len(self.get_readonly_server().logs))