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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-25 03:36:18 UTC
  • mfrom: (6034.2.4 test-feature-cleanup)
  • Revision ID: pqm@pqm.ubuntu.com-20110725033618-n5g9qg6iwyz2dqzw
(mbp) move test feature dependencies into test.features (Martin Pool)

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,
2184
2185
        self.assertTrue(wt.is_executable('foo-id'))
2185
2186
 
2186
2187
    def test_create_symlink(self):
2187
 
        self.requireFeature(tests.SymlinkFeature)
 
2188
        self.requireFeature(features.SymlinkFeature)
2188
2189
        #   A
2189
2190
        #  / \
2190
2191
        # B   C
2249
2250
                             wt.get_file_text('foo-id'))
2250
2251
 
2251
2252
    def test_modified_symlink(self):
2252
 
        self.requireFeature(tests.SymlinkFeature)
 
2253
        self.requireFeature(features.SymlinkFeature)
2253
2254
        #   A       Create symlink foo => bar
2254
2255
        #  / \
2255
2256
        # B   C     B relinks foo => baz
2294
2295
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2295
2296
 
2296
2297
    def test_renamed_symlink(self):
2297
 
        self.requireFeature(tests.SymlinkFeature)
 
2298
        self.requireFeature(features.SymlinkFeature)
2298
2299
        #   A       Create symlink foo => bar
2299
2300
        #  / \
2300
2301
        # B   C     B renames foo => barry
2350
2351
        self.assertEqual('blah', wt.id2path('foo-id'))
2351
2352
 
2352
2353
    def test_symlink_no_content_change(self):
2353
 
        self.requireFeature(tests.SymlinkFeature)
 
2354
        self.requireFeature(features.SymlinkFeature)
2354
2355
        #   A       Create symlink foo => bar
2355
2356
        #  / \
2356
2357
        # B   C     B relinks foo => baz
2401
2402
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2402
2403
 
2403
2404
    def test_symlink_this_changed_kind(self):
2404
 
        self.requireFeature(tests.SymlinkFeature)
 
2405
        self.requireFeature(features.SymlinkFeature)
2405
2406
        #   A       Nothing
2406
2407
        #  / \
2407
2408
        # B   C     B creates symlink foo => bar
2454
2455
 
2455
2456
    def test_symlink_all_wt(self):
2456
2457
        """Check behavior if all trees are Working Trees."""
2457
 
        self.requireFeature(tests.SymlinkFeature)
 
2458
        self.requireFeature(features.SymlinkFeature)
2458
2459
        # The big issue is that entry.symlink_target is None for WorkingTrees.
2459
2460
        # So we need to make sure we handle that case correctly.
2460
2461
        #   A   foo => bar