← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
46
46
    test_commit,
47
47
    )
48
48
from bzrlib.transform import TreeTransform
 
49
from bzrlib.tests import (
 
50
    features,
 
51
    )
49
52
 
50
53
 
51
54
def get_text(vf, key):
682
685
    def _test_symlink_bundle(self, link_name, link_target, new_link_target):
683
686
        link_id = 'link-1'
684
687
 
685
 
        self.requireFeature(tests.SymlinkFeature)
 
688
        self.requireFeature(features.SymlinkFeature)
686
689
        self.tree1 = self.make_branch_and_tree('b1')
687
690
        self.b1 = self.tree1.branch
688
691
 
729
732
        self._test_symlink_bundle('link', 'bar/foo', 'mars')
730
733
 
731
734
    def test_unicode_symlink_bundle(self):
732
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
735
        self.requireFeature(features.UnicodeFilenameFeature)
733
736
        self._test_symlink_bundle(u'\N{Euro Sign}link',
734
737
                                  u'bar/\N{Euro Sign}foo',
735
738
                                  u'mars\N{Euro Sign}')
836
839
        return bundle_file.getvalue()
837
840
 
838
841
    def test_unicode_bundle(self):
839
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
842
        self.requireFeature(features.UnicodeFilenameFeature)
840
843
        # Handle international characters
841
844
        os.mkdir('b1')
842
845
        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')