← 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: John Arbash Meinel
  • Date: 2010-01-13 23:06:42 UTC
  • mfrom: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: john@arbash-meinel.com-20100113230642-gr0vg8u3qyzz3p2b
Merge bzr.stable, bringing in bug fixes #175839, #504390

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-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
390
390
        self.assertLength(18, self.hpss_calls)
391
391
        remote = Branch.open('stacked')
392
392
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
 
393
    
 
394
    def test_pull_cross_format_warning(self):
 
395
        """You get a warning for probably slow cross-format pulls.
 
396
        """
393
397
 
 
398
        from_tree = self.make_branch_and_tree('from', format='2a')
 
399
        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
 
400
        from_tree.commit(message='first commit')
 
401
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
 
402
        self.assertContainsRe(err,
 
403
            "(?m)Fetching between repositories with different formats.*")