/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: Aaron Bentley
  • Date: 2007-11-28 00:05:31 UTC
  • mto: This revision was merged to the branch mainline in revision 3044.
  • Revision ID: aaron.bentley@utoronto.ca-20071128000531-mq2lgadv5c9471nf
Get conflict handling and case-insensitive tree creation under test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
44
44
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths, 
45
45
                              resolve_conflicts, cook_conflicts, 
46
46
                              find_interesting, build_tree, get_backup_name,
47
 
                              change_entry, _FileMover)
 
47
                              change_entry, _FileMover, resolve_checkout)
48
48
 
49
49
 
50
50
class TestTreeTransform(tests.TestCaseWithTransport):
266
266
        self.failUnlessExists('tree/file')
267
267
        self.failUnlessExists('tree/FiLe.moved')
268
268
 
269
 
    def test_resolve_checkout_conflict(self):
 
269
    def test_resolve_checkout_case_conflict(self):
270
270
        tree = self.make_branch_and_tree('tree')
271
271
        # Don't try this at home, kids!
272
272
        # Force the tree to report that it is case insensitive, for conflict
276
276
        self.addCleanup(transform.finalize)
277
277
        transform.new_file('file', transform.root, 'content')
278
278
        transform.new_file('FiLe', transform.root, 'content')
279
 
        resolve_conflicts(transform)
 
279
        resolve_conflicts(transform,
 
280
                          pass_func=lambda t, c: resolve_checkout(t, c, []))
280
281
        transform.apply()
281
282
        self.failUnlessExists('tree/file')
282
283
        self.failUnlessExists('tree/FiLe.moved')
283
284
 
 
285
    def test_apply_case_conflict(self):
 
286
        tree = self.make_branch_and_tree('tree')
 
287
        # Don't try this at home, kids!
 
288
        # Force the tree to report that it is case insensitive, for conflict
 
289
        # resolution tests
 
290
        transform = TreeTransform(tree)
 
291
        self.addCleanup(transform.finalize)
 
292
        transform.new_file('file', transform.root, 'content')
 
293
        transform.new_file('FiLe', transform.root, 'content')
 
294
        resolve_conflicts(transform,
 
295
                          pass_func=lambda t, c: resolve_checkout(t, c, []))
 
296
        transform.apply()
 
297
        self.failUnlessExists('file')
 
298
        if not os.path.exists('FiLe.moved'):
 
299
            self.failUnlessExists('FiLe')
 
300
 
284
301
    def test_case_insensitive_limbo(self):
285
302
        tree = self.make_branch_and_tree('tree')
286
303
        # Don't try this at home, kids!