← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Martin Pool
  • Date: 2011-06-14 01:26:41 UTC
  • mto: (6034.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 6043.
  • Revision ID: mbp@canonical.com-20110614012641-dnb69zb57ae5je4w
Move all test features into bzrlib.tests.features

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
37
37
from bzrlib.merge import transform_tree, merge_inner, _PlanMerge
38
38
from bzrlib.osutils import basename, pathjoin, file_kind
39
39
from bzrlib.tests import (
 
40
    features,
40
41
    TestCaseWithMemoryTransport,
41
42
    TestCaseWithTransport,
42
43
    test_merge_core,
2118
2119
        self.assertTrue(wt.is_executable('foo-id'))
2119
2120
 
2120
2121
    def test_create_symlink(self):
2121
 
        self.requireFeature(tests.SymlinkFeature)
 
2122
        self.requireFeature(features.SymlinkFeature)
2122
2123
        #   A
2123
2124
        #  / \
2124
2125
        # B   C
2183
2184
                             wt.get_file_text('foo-id'))
2184
2185
 
2185
2186
    def test_modified_symlink(self):
2186
 
        self.requireFeature(tests.SymlinkFeature)
 
2187
        self.requireFeature(features.SymlinkFeature)
2187
2188
        #   A       Create symlink foo => bar
2188
2189
        #  / \
2189
2190
        # B   C     B relinks foo => baz
2228
2229
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2229
2230
 
2230
2231
    def test_renamed_symlink(self):
2231
 
        self.requireFeature(tests.SymlinkFeature)
 
2232
        self.requireFeature(features.SymlinkFeature)
2232
2233
        #   A       Create symlink foo => bar
2233
2234
        #  / \
2234
2235
        # B   C     B renames foo => barry
2284
2285
        self.assertEqual('blah', wt.id2path('foo-id'))
2285
2286
 
2286
2287
    def test_symlink_no_content_change(self):
2287
 
        self.requireFeature(tests.SymlinkFeature)
 
2288
        self.requireFeature(features.SymlinkFeature)
2288
2289
        #   A       Create symlink foo => bar
2289
2290
        #  / \
2290
2291
        # B   C     B relinks foo => baz
2335
2336
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2336
2337
 
2337
2338
    def test_symlink_this_changed_kind(self):
2338
 
        self.requireFeature(tests.SymlinkFeature)
 
2339
        self.requireFeature(features.SymlinkFeature)
2339
2340
        #   A       Nothing
2340
2341
        #  / \
2341
2342
        # B   C     B creates symlink foo => bar
2388
2389
 
2389
2390
    def test_symlink_all_wt(self):
2390
2391
        """Check behavior if all trees are Working Trees."""
2391
 
        self.requireFeature(tests.SymlinkFeature)
 
2392
        self.requireFeature(features.SymlinkFeature)
2392
2393
        # The big issue is that entry.symlink_target is None for WorkingTrees.
2393
2394
        # So we need to make sure we handle that case correctly.
2394
2395
        #   A   foo => bar