~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Handled test cases involving symlinks

Show diffs side-by-side

added added

removed removed

Lines of Context:
495
495
        self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
496
496
 
497
497
    def test_file_merge(self):
 
498
        if not has_symlinks():
 
499
            raise TestSkipped('Symlinks are not supported on this platform')
498
500
        base = TransformGroup("BASE")
499
501
        this = TransformGroup("THIS")
500
502
        other = TransformGroup("OTHER")
582
584
        this.tt.new_file('h1', this_b, 'h1', 'h')
583
585
 
584
586
        base.tt.new_file('i', base.root, 'i', 'i')
585
 
        this.tt.new_directory('i1', this_a, 'i')
586
 
        other.tt.new_symlink('i', this_b, 'i', 'i')
 
587
        other.tt.new_directory('i1', this_b, 'i')
587
588
 
588
589
        for tg in [this, base, other]:
589
590
            tg.tt.apply()