/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_bundle.py

  • Committer: Daniel Watkins
  • Date: 2007-11-06 09:33:05 UTC
  • mfrom: (2967 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2993.
  • Revision ID: d.m.watkins@warwick.ac.uk-20071106093305-zfef3c0jbcvunnuz
Merged bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
40
40
                           NoSuchFile,)
41
41
from bzrlib.merge import Merge3Merger
42
42
from bzrlib.repofmt import knitrepo
43
 
from bzrlib.osutils import has_symlinks, sha_file
44
 
from bzrlib.tests import (TestCaseInTempDir, TestCaseWithTransport,
45
 
                          TestCase, TestSkipped, test_commit)
 
43
from bzrlib.osutils import sha_file
 
44
from bzrlib.tests import (
 
45
    SymlinkFeature,
 
46
    TestCase,
 
47
    TestCaseInTempDir,
 
48
    TestCaseWithTransport,
 
49
    TestSkipped,
 
50
    test_commit,
 
51
    )
46
52
from bzrlib.transform import TreeTransform
47
 
from bzrlib.workingtree import WorkingTree
48
53
 
49
54
 
50
55
class MockTree(object):
642
647
        bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
643
648
 
644
649
    def test_symlink_bundle(self):
645
 
        if not has_symlinks():
646
 
            raise TestSkipped("No symlink support")
 
650
        self.requireFeature(SymlinkFeature)
647
651
        self.tree1 = self.make_branch_and_tree('b1')
648
652
        self.b1 = self.tree1.branch
649
653
        tt = TreeTransform(self.tree1)
795
799
                          rev_id='i18n-1', committer=u'William Dod\xe9')
796
800
 
797
801
        if sys.platform == 'darwin':
 
802
            from bzrlib.workingtree import WorkingTree3
 
803
            if type(self.tree1) is WorkingTree3:
 
804
                self.knownFailure("Bug #141438: fails for WorkingTree3 on OSX")
 
805
 
798
806
            # On Mac the '\xe9' gets changed to 'e\u0301'
799
807
            self.assertEqual([u'.bzr', u'with Dode\u0301'],
800
808
                             sorted(os.listdir(u'b1')))