/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: Robert Collins
  • Date: 2007-11-27 20:35:02 UTC
  • mfrom: (3036 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3038.
  • Revision ID: robertc@robertcollins.net-20071127203502-280mxe1zvdlagrpe
Merge with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
410
410
        self.assertEqual(os.readlink(self.wt.abspath('oz/wizard')),
411
411
                         'wizard-target')
412
412
 
 
413
    def test_unable_create_symlink(self):
 
414
        def tt_helper():
 
415
            wt = self.make_branch_and_tree('.')
 
416
            tt = TreeTransform(wt)  # TreeTransform obtains write lock
 
417
            try:
 
418
                tt.new_symlink('foo', tt.root, 'bar')
 
419
                tt.apply()
 
420
            finally:
 
421
                wt.unlock()
 
422
        os_symlink = getattr(os, 'symlink', None)
 
423
        os.symlink = None
 
424
        try:
 
425
            err = self.assertRaises(errors.UnableCreateSymlink, tt_helper)
 
426
            self.assertEquals(
 
427
                "Unable to create symlink 'foo' on this platform",
 
428
                str(err))
 
429
        finally:
 
430
            if os_symlink:
 
431
                os.symlink = os_symlink
 
432
 
413
433
    def get_conflicted(self):
414
434
        create,root = self.get_transform()
415
435
        create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
1167
1187
 
1168
1188
class TestBuildTree(tests.TestCaseWithTransport):
1169
1189
 
1170
 
    def test_build_tree(self):
 
1190
    def test_build_tree_with_symlinks(self):
1171
1191
        self.requireFeature(SymlinkFeature)
1172
1192
        os.mkdir('a')
1173
1193
        a = BzrDir.create_standalone_workingtree('a')
1469
1489
                          _mover=self.ExceptionFileMover(bad_target='d'))
1470
1490
        self.failUnlessExists('a')
1471
1491
        self.failUnlessExists('a/b')
 
1492
 
 
1493
    def test_resolve_no_parent(self):
 
1494
        wt = self.make_branch_and_tree('.')
 
1495
        tt = TreeTransform(wt)
 
1496
        self.addCleanup(tt.finalize)
 
1497
        parent = tt.trans_id_file_id('parent-id')
 
1498
        tt.new_file('file', parent, 'Contents')
 
1499
        resolve_conflicts(tt)