← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Andrew Bennetts
  • Date: 2007-11-10 15:09:09 UTC
  • mfrom: (2916.2.17 streamable-containers)
  • mto: This revision was merged to the branch mainline in revision 3174.
  • Revision ID: andrew.bennetts@canonical.com-20071110150909-ik5254kgn930th10
Merge streamable-containers.

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
53
 
48
54
 
641
647
        bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
642
648
 
643
649
    def test_symlink_bundle(self):
644
 
        if not has_symlinks():
645
 
            raise TestSkipped("No symlink support")
 
650
        self.requireFeature(SymlinkFeature)
646
651
        self.tree1 = self.make_branch_and_tree('b1')
647
652
        self.b1 = self.tree1.branch
648
653
        tt = TreeTransform(self.tree1)