← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_commit_builder.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/per_repository/test_commit_builder.py
29
29
    tests,
30
30
    )
31
31
from bzrlib.tests import per_repository
 
32
from bzrlib.tests import (
 
33
    features,
 
34
    )
32
35
 
33
36
 
34
37
class TestCommitBuilder(per_repository.TestCaseWithRepository):
628
631
 
629
632
    def test_last_modified_revision_after_commit_link_unchanged(self):
630
633
        # committing without changing a link does not change the last modified.
631
 
        self.requireFeature(tests.SymlinkFeature)
 
634
        self.requireFeature(features.SymlinkFeature)
632
635
        tree = self.make_branch_and_tree('.')
633
636
        os.symlink('target', 'link')
634
637
        self._add_commit_check_unchanged(tree, 'link')
635
638
 
636
639
    def test_last_modified_revision_after_commit_link_unchanged_ric(self):
637
640
        # committing without changing a link does not change the last modified.
638
 
        self.requireFeature(tests.SymlinkFeature)
 
641
        self.requireFeature(features.SymlinkFeature)
639
642
        tree = self.make_branch_and_tree('.')
640
643
        os.symlink('target', 'link')
641
644
        self._add_commit_check_unchanged(tree, 'link',
710
713
 
711
714
    def test_last_modified_revision_after_rename_link_changes(self):
712
715
        # renaming a link changes the last modified.
713
 
        self.requireFeature(tests.SymlinkFeature)
 
716
        self.requireFeature(features.SymlinkFeature)
714
717
        tree = self.make_branch_and_tree('.')
715
718
        os.symlink('target', 'link')
716
719
        self._add_commit_renamed_check_changed(tree, 'link')
717
720
 
718
721
    def test_last_modified_revision_after_rename_link_changes_ric(self):
719
722
        # renaming a link changes the last modified.
720
 
        self.requireFeature(tests.SymlinkFeature)
 
723
        self.requireFeature(features.SymlinkFeature)
721
724
        tree = self.make_branch_and_tree('.')
722
725
        os.symlink('target', 'link')
723
726
        self._add_commit_renamed_check_changed(tree, 'link',
785
788
 
786
789
    def test_last_modified_revision_after_reparent_link_changes(self):
787
790
        # reparenting a link changes the last modified.
788
 
        self.requireFeature(tests.SymlinkFeature)
 
791
        self.requireFeature(features.SymlinkFeature)
789
792
        tree = self.make_branch_and_tree('.')
790
793
        os.symlink('target', 'link')
791
794
        self._add_commit_reparent_check_changed(tree, 'link')
792
795
 
793
796
    def test_last_modified_revision_after_reparent_link_changes_ric(self):
794
797
        # reparenting a link changes the last modified.
795
 
        self.requireFeature(tests.SymlinkFeature)
 
798
        self.requireFeature(features.SymlinkFeature)
796
799
        tree = self.make_branch_and_tree('.')
797
800
        os.symlink('target', 'link')
798
801
        self._add_commit_reparent_check_changed(tree, 'link',
1020
1023
 
1021
1024
    def test_last_modified_revision_after_content_link_changes(self):
1022
1025
        # changing a link changes the last modified.
1023
 
        self.requireFeature(tests.SymlinkFeature)
 
1026
        self.requireFeature(features.SymlinkFeature)
1024
1027
        tree = self.make_branch_and_tree('.')
1025
1028
        os.symlink('target', 'link')
1026
1029
        def change_link():
1033
1036
        if file_id is None:
1034
1037
            file_id = link
1035
1038
        # changing a link changes the last modified.
1036
 
        self.requireFeature(tests.SymlinkFeature)
 
1039
        self.requireFeature(features.SymlinkFeature)
1037
1040
        tree = self.make_branch_and_tree('.')
1038
1041
        os.symlink(target, link)
1039
1042
        def change_link():
1049
1052
            'link', 'target', 'newtarget')
1050
1053
 
1051
1054
    def test_last_modified_rev_after_content_unicode_link_changes_ric(self):
1052
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
1055
        self.requireFeature(features.UnicodeFilenameFeature)
1053
1056
        self._test_last_mod_rev_after_content_link_changes_ric(
1054
1057
            u'li\u1234nk', u'targ\N{Euro Sign}t', u'n\N{Euro Sign}wtarget',
1055
1058
 
1114
1117
 
1115
1118
    def test_last_modified_revision_after_merge_link_changes(self):
1116
1119
        # merge a link changes the last modified.
1117
 
        self.requireFeature(tests.SymlinkFeature)
 
1120
        self.requireFeature(features.SymlinkFeature)
1118
1121
        tree1 = self.make_branch_and_tree('t1')
1119
1122
        os.symlink('target', 't1/link')
1120
1123
        self._commit_sprout_rename_merge(tree1, 'link')
1121
1124
 
1122
1125
    def test_last_modified_revision_after_merge_link_changes_ric(self):
1123
1126
        # merge a link changes the last modified.
1124
 
        self.requireFeature(tests.SymlinkFeature)
 
1127
        self.requireFeature(features.SymlinkFeature)
1125
1128
        tree1 = self.make_branch_and_tree('t1')
1126
1129
        os.symlink('target', 't1/link')
1127
1130
        self._commit_sprout_rename_merge(tree1, 'link',
1208
1211
 
1209
1212
    def test_last_modified_revision_after_converged_merge_link_unchanged(self):
1210
1213
        # merge a link that changed preserves the last modified.
1211
 
        self.requireFeature(tests.SymlinkFeature)
 
1214
        self.requireFeature(features.SymlinkFeature)
1212
1215
        tree1 = self.make_branch_and_tree('t1')
1213
1216
        os.symlink('target', 't1/link')
1214
1217
        self._commit_sprout_rename_merge_converged(tree1, 'link')
1215
1218
 
1216
1219
    def test_last_modified_revision_after_converged_merge_link_unchanged_ric(self):
1217
1220
        # merge a link that changed preserves the last modified.
1218
 
        self.requireFeature(tests.SymlinkFeature)
 
1221
        self.requireFeature(features.SymlinkFeature)
1219
1222
        tree1 = self.make_branch_and_tree('t1')
1220
1223
        os.symlink('target', 't1/link')
1221
1224
        self._commit_sprout_rename_merge_converged(tree1, 'link',
1261
1264
        self.build_tree([name])
1262
1265
 
1263
1266
    def make_link(self, name):
1264
 
        self.requireFeature(tests.SymlinkFeature)
 
1267
        self.requireFeature(features.SymlinkFeature)
1265
1268
        os.symlink('target', name)
1266
1269
 
1267
1270
    def make_reference(self, name):