← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

[merge] up-to-date against bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
18
18
import sys
19
19
 
20
20
import bzrlib.errors
21
 
from bzrlib.selftest.testrevision import make_branches
 
21
from bzrlib.tests.test_revision import make_branches
22
22
from bzrlib.trace import mutter
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.fetch import greedy_fetch
25
25
from bzrlib.merge import merge
26
26
from bzrlib.clone import copy_branch
27
27
 
28
 
from bzrlib.selftest import TestCaseInTempDir
29
 
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
 
28
from bzrlib.tests import TestCaseInTempDir
 
29
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
30
30
 
31
31
 
32
32
def has_revision(branch, revision_id):
33
33
    try:
34
 
        branch.get_revision_xml_file(revision_id)
 
34
        branch.get_revision_xml(revision_id)
35
35
        return True
36
36
    except bzrlib.errors.NoSuchRevision:
37
37
        return False
151
151
        os.mkdir('br1')
152
152
        br1 = Branch.initialize('br1')
153
153
        self.build_tree_contents([('br1/file', 'original contents\n')])
154
 
        br1.add(['file'], ['this-file-id'])
 
154
        br1.working_tree().add(['file'], ['this-file-id'])
155
155
        br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
156
156
        copy_branch(br1, 'br2')
157
157
        br2 = Branch.open('br2')
194
194
    def log(self, *args):
195
195
        """Capture web server log messages for introspection."""
196
196
        super(TestHttpFetch, self).log(*args)
 
197
        # if this call indicates a url being fetched, save it specially
197
198
        if args[0].startswith("webserver"):
198
 
            self.weblogs.append(args[0])
 
199
            self.weblogs.append(args[3])
199
200
 
200
201
    def test_weaves_are_retrieved_once(self):
201
202
        self.build_tree(("source/", "source/file", "target/"))
202
203
        branch = Branch.initialize("source")
203
 
        branch.add(["file"], ["id"])
 
204
        branch.working_tree().add(["file"], ["id"])
204
205
        branch.working_tree().commit("added file")
205
206
        print >>open("source/file", 'w'), "blah"
206
207
        branch.working_tree().commit("changed file")