← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr pull."""
20
20
import os
21
21
import sys
22
22
 
 
23
from bzrlib import (
 
24
    debug,
 
25
    remote,
 
26
    urlutils,
 
27
    )
 
28
 
23
29
from bzrlib.branch import Branch
24
30
from bzrlib.directory_service import directories
25
31
from bzrlib.osutils import pathjoin
26
32
from bzrlib.tests.blackbox import ExternalBase
27
33
from bzrlib.uncommit import uncommit
28
34
from bzrlib.workingtree import WorkingTree
29
 
from bzrlib import urlutils
30
35
 
31
36
 
32
37
class TestPull(ExternalBase):
239
244
        out = self.run_bzr('pull ../branch_a', retcode=3)
240
245
        self.assertEqual(out,
241
246
                ('','bzr: ERROR: These branches have diverged.'
242
 
                    ' Use the merge command to reconcile them.\n'))
 
247
                    ' Use the missing command to see how.\n'
 
248
                    'Use the merge command to reconcile them.\n'))
243
249
        self.assertEqual(branch_b.get_parent(), parent)
244
250
        # test implicit --remember after resolving previous failure
245
251
        uncommit(branch=branch_b, tree=tree_b)
337
343
            def look_up(self, name, url):
338
344
                return 'source'
339
345
        directories.register('foo:', FooService, 'Testing directory service')
340
 
        self.addCleanup(lambda: directories.remove('foo:'))
 
346
        self.addCleanup(directories.remove, 'foo:')
341
347
        self.run_bzr('pull foo:bar -d target')
342
348
        self.assertEqual(source_last, target.last_revision())
343
349
 
358
364
        self.assertContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
359
365
        self.assertNotContainsRe(
360
366
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')
 
367
 
 
368
    def test_pull_smart_stacked_streaming_acceptance(self):
 
369
        """'bzr pull -r 123' works on stacked, smart branches, even when the
 
370
        revision specified by the revno is only present in the fallback
 
371
        repository.
 
372
 
 
373
        See <https://launchpad.net/bugs/380314>
 
374
        """
 
375
        self.setup_smart_server_with_call_log()
 
376
        # Make a stacked-on branch with two commits so that the
 
377
        # revision-history can't be determined just by looking at the parent
 
378
        # field in the revision in the stacked repo.
 
379
        parent = self.make_branch_and_tree('parent', format='1.9')
 
380
        parent.commit(message='first commit')
 
381
        parent.commit(message='second commit')
 
382
        local = parent.bzrdir.sprout('local').open_workingtree()
 
383
        local.commit(message='local commit')
 
384
        local.branch.create_clone_on_transport(
 
385
            self.get_transport('stacked'), stacked_on=self.get_url('parent'))
 
386
        empty = self.make_branch_and_tree('empty', format='1.9')
 
387
        self.reset_smart_call_log()
 
388
        self.run_bzr(['pull', '-r', '1', self.get_url('stacked')],
 
389
            working_dir='empty')
 
390
        # This figure represent the amount of work to perform this use case. It
 
391
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
392
        # being too low. If rpc_count increases, more network roundtrips have
 
393
        # become necessary for this use case. Please do not adjust this number
 
394
        # upwards without agreement from bzr's network support maintainers.
 
395
        self.assertLength(18, self.hpss_calls)
 
396
        remote = Branch.open('stacked')
 
397
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
 
398
    
 
399
    def test_pull_cross_format_warning(self):
 
400
        """You get a warning for probably slow cross-format pulls.
 
401
        """
 
402
        # this is assumed to be going through InterDifferingSerializer
 
403
        from_tree = self.make_branch_and_tree('from', format='2a')
 
404
        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
 
405
        from_tree.commit(message='first commit')
 
406
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
 
407
        self.assertContainsRe(err,
 
408
            "(?m)Doing on-the-fly conversion")
 
409
 
 
410
    def test_pull_cross_format_warning_no_IDS(self):
 
411
        """You get a warning for probably slow cross-format pulls.
 
412
        """
 
413
        # this simulates what would happen across the network, where
 
414
        # interdifferingserializer is not active
 
415
 
 
416
        debug.debug_flags.add('IDS_never')
 
417
        # TestCase take care of restoring them
 
418
 
 
419
        from_tree = self.make_branch_and_tree('from', format='2a')
 
420
        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
 
421
        from_tree.commit(message='first commit')
 
422
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
 
423
        self.assertContainsRe(err,
 
424
            "(?m)Doing on-the-fly conversion")
 
425
 
 
426
    def test_pull_cross_format_from_network(self):
 
427
        self.setup_smart_server_with_call_log()
 
428
        from_tree = self.make_branch_and_tree('from', format='2a')
 
429
        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
 
430
        self.assertIsInstance(from_tree.branch, remote.RemoteBranch)
 
431
        from_tree.commit(message='first commit')
 
432
        out, err = self.run_bzr(['pull', '-d', 'to',
 
433
            from_tree.branch.bzrdir.root_transport.base])
 
434
        self.assertContainsRe(err,
 
435
            "(?m)Doing on-the-fly conversion")