← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_move.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_move.py
21
21
from bzrlib import (
22
22
    errors,
23
23
    osutils,
 
24
    tests,
24
25
    )
25
26
 
26
 
from bzrlib.workingtree_4 import DirStateWorkingTreeFormat
27
27
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
28
28
 
29
29
 
173
173
                               ('b/c', 'c-id')], tree)
174
174
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
175
175
                               ('b/c', 'c-id')], tree.basis_tree())
176
 
        self.failIfExists('a')
 
176
        self.assertPathDoesNotExist('a')
177
177
        self.assertFileEqual(a_contents, 'b/a')
178
178
        tree._validate()
179
179
 
190
190
                               ('c', 'c-id')], tree)
191
191
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
192
192
                               ('b/c', 'c-id')], tree.basis_tree())
193
 
        self.failIfExists('b/c')
 
193
        self.assertPathDoesNotExist('b/c')
194
194
        self.assertFileEqual(c_contents, 'c')
195
195
        tree._validate()
196
196
 
209
209
            self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
210
210
                                   ('c', 'c-id')], tree)
211
211
        else:
212
 
            self.failUnlessExists('b/c')
 
212
            self.assertPathExists('b/c')
213
213
            self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
214
214
                                   ('b/c', 'c-id')], tree)
215
215
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
543
543
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('c', 'c-id'),
544
544
                               ('a/b', 'b-id')], tree.basis_tree())
545
545
        tree._validate()
 
546
 
 
547
    def test_move_to_unversioned_non_ascii_dir(self):
 
548
        """Check error when moving to unversioned non-ascii directory"""
 
549
        self.requireFeature(tests.UnicodeFilename)
 
550
        tree = self.make_branch_and_tree(".")
 
551
        self.build_tree(["a", u"\xA7/"])
 
552
        tree.add(["a"])
 
553
        e = self.assertRaises(errors.BzrMoveFailedError,
 
554
            tree.move, ["a"], u"\xA7")
 
555
        self.assertIsInstance(e.extra, errors.NotVersionedError)
 
556
        self.assertEqual(e.extra.path, u"\xA7")
 
557
 
 
558
    def test_move_unversioned_non_ascii(self):
 
559
        """Check error when moving an unversioned non-ascii file"""
 
560
        self.requireFeature(tests.UnicodeFilename)
 
561
        tree = self.make_branch_and_tree(".")
 
562
        self.build_tree([u"\xA7", "dir/"])
 
563
        tree.add("dir")
 
564
        e = self.assertRaises(errors.BzrMoveFailedError,
 
565
            tree.move, [u"\xA7"], "dir")
 
566
        self.assertIsInstance(e.extra, errors.NotVersionedError)
 
567
        self.assertEqual(e.extra.path, u"\xA7")