/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_pull.py

  • Committer: Robert Collins
  • Date: 2008-04-04 00:43:07 UTC
  • mfrom: (3331 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3333.
  • Revision ID: robertc@robertcollins.net-20080404004307-0whomfhm3yal2rvw
Resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
21
21
import sys
22
22
 
23
23
from bzrlib.branch import Branch
 
24
from bzrlib.directory_service import directories
24
25
from bzrlib.osutils import pathjoin
25
26
from bzrlib.tests.blackbox import ExternalBase
26
27
from bzrlib.uncommit import uncommit
324
325
        self.assertEqual(out, '')
325
326
        self.assertEqual(err, '')
326
327
        self.assertEqual(tree_b.last_revision(), revision_id)
 
328
 
 
329
    def test_pull_from_directory_service(self):
 
330
        source = self.make_branch_and_tree('source')
 
331
        source.commit('commit 1')
 
332
        target = source.bzrdir.sprout('target').open_workingtree()
 
333
        source_last = source.commit('commit 2')
 
334
        class FooService(object):
 
335
            """A directory service that always returns source"""
 
336
 
 
337
            def look_up(self, name, url):
 
338
                return 'source'
 
339
        directories.register('foo:', FooService, 'Testing directory service')
 
340
        self.addCleanup(lambda: directories.remove('foo:'))
 
341
        self.run_bzr('pull foo:bar -d target')
 
342
        self.assertEqual(source_last, target.last_revision())