← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-10-27 15:38:14 UTC
  • mfrom: (6015.44.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6236.
  • Revision ID: v.ladeuil+lp@free.fr-20111027153814-0r4nd2io1jv6t47f
Merge 2.4 into trunk including fix for bug #880701

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_mv.py
25
25
    )
26
26
 
27
27
from bzrlib.tests import (
 
28
    TestCaseWithTransport,
 
29
    )
 
30
from bzrlib.tests.features import (
28
31
    CaseInsensitiveFilesystemFeature,
29
32
    SymlinkFeature,
30
 
    TestCaseWithTransport,
31
 
    UnicodeFilename,
 
33
    UnicodeFilenameFeature,
32
34
    )
33
35
 
34
36
 
185
187
        self.run_bzr('move a b')
186
188
        self.run_bzr('rename b a')
187
189
 
 
190
    def test_mv_no_root(self):
 
191
        tree = self.make_branch_and_tree('.')
 
192
        self.run_bzr_error(
 
193
            ["bzr: ERROR: can not move root of branch"],
 
194
            'mv . a')
 
195
 
188
196
    def test_mv_through_symlinks(self):
189
197
        self.requireFeature(SymlinkFeature)
190
198
        tree = self.make_branch_and_tree('.')
508
516
 
509
517
    def test_mv_unversioned_non_ascii(self):
510
518
        """Clear error on mv of an unversioned non-ascii file, see lp:707954"""
511
 
        self.requireFeature(UnicodeFilename)
 
519
        self.requireFeature(UnicodeFilenameFeature)
512
520
        tree = self.make_branch_and_tree(".")
513
521
        self.build_tree([u"\xA7"])
514
522
        out, err = self.run_bzr_error(["Could not rename", "not versioned"],