← 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: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_mv.py
187
187
        self.run_bzr('move a b')
188
188
        self.run_bzr('rename b a')
189
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
 
190
196
    def test_mv_through_symlinks(self):
191
197
        self.requireFeature(SymlinkFeature)
192
198
        tree = self.make_branch_and_tree('.')
515
521
        self.build_tree([u"\xA7"])
516
522
        out, err = self.run_bzr_error(["Could not rename", "not versioned"],
517
523
            ["mv", u"\xA7", "b"])
 
524
 
 
525
    def test_mv_removed_non_ascii(self):
 
526
        """Clear error on mv of a removed non-ascii file, see lp:898541"""
 
527
        self.requireFeature(UnicodeFilenameFeature)
 
528
        tree = self.make_branch_and_tree(".")
 
529
        self.build_tree([u"\xA7"])
 
530
        tree.add([u"\xA7"])
 
531
        tree.commit(u"Adding \xA7")
 
532
        os.remove(u"\xA7")
 
533
        out, err = self.run_bzr_error(["Could not rename", "not exist"],
 
534
            ["mv", u"\xA7", "b"])