/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: John Arbash Meinel
  • Date: 2007-12-05 18:47:51 UTC
  • mfrom: (3079 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3080.
  • Revision ID: john@arbash-meinel.com-20071205184751-58fi7xoj8ddox6ch
[merge] bzr.dev 3079

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
36
36
from bzrlib.osutils import file_kind, pathjoin
37
37
from bzrlib.merge import Merge3Merger
38
38
from bzrlib.tests import (
 
39
    CaseInsensitiveFilesystemFeature,
39
40
    SymlinkFeature,
40
41
    TestCase,
41
42
    TestCaseInTempDir,
1088
1089
        self.callDeprecated([txt], change_entry, None, None, None, None, None,
1089
1090
            None, None, None)
1090
1091
 
 
1092
    def test_case_insensitive_clash(self):
 
1093
        self.requireFeature(CaseInsensitiveFilesystemFeature)
 
1094
        def tt_helper():
 
1095
            wt = self.make_branch_and_tree('.')
 
1096
            tt = TreeTransform(wt)  # TreeTransform obtains write lock
 
1097
            try:
 
1098
                tt.new_file('foo', tt.root, 'bar')
 
1099
                tt.new_file('Foo', tt.root, 'spam')
 
1100
                # Lie to tt that we've already resolved all conflicts.
 
1101
                tt.apply(no_conflicts=True)
 
1102
            except:
 
1103
                wt.unlock()
 
1104
                raise
 
1105
        err = self.assertRaises(errors.FileExists, tt_helper)
 
1106
        self.assertContainsRe(str(err),
 
1107
            "^File exists: .+/foo")
 
1108
 
 
1109
    def test_two_directories_clash(self):
 
1110
        def tt_helper():
 
1111
            wt = self.make_branch_and_tree('.')
 
1112
            tt = TreeTransform(wt)  # TreeTransform obtains write lock
 
1113
            try:
 
1114
                foo_1 = tt.new_directory('foo', tt.root)
 
1115
                tt.new_directory('bar', foo_1)
 
1116
                foo_2 = tt.new_directory('foo', tt.root)
 
1117
                tt.new_directory('baz', foo_2)
 
1118
                # Lie to tt that we've already resolved all conflicts.
 
1119
                tt.apply(no_conflicts=True)
 
1120
            except:
 
1121
                wt.unlock()
 
1122
                raise
 
1123
        err = self.assertRaises(errors.FileExists, tt_helper)
 
1124
        self.assertContainsRe(str(err),
 
1125
            "^File exists: .+/foo")
 
1126
 
1091
1127
 
1092
1128
class TransformGroup(object):
 
1129
 
1093
1130
    def __init__(self, dirname, root_id):
1094
1131
        self.name = dirname
1095
1132
        os.mkdir(dirname)
1462
1499
        object.__init__(self)
1463
1500
        self.name = "name"
1464
1501
 
 
1502
 
1465
1503
class TestGetBackupName(TestCase):
1466
1504
    def test_get_backup_name(self):
1467
1505
        tt = MockTransform()
1521
1559
        mover.rename('c/e', 'c/d')
1522
1560
        try:
1523
1561
            mover.rename('a', 'c')
1524
 
        except OSError, e:
 
1562
        except errors.FileExists, e:
1525
1563
            mover.rollback()
1526
1564
        self.failUnlessExists('a')
1527
1565
        self.failUnlessExists('c/d')