← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__dirstate_helpers.py

  • Committer: Jonathan Riddell
  • Date: 2011-06-24 13:57:59 UTC
  • mto: This revision was merged to the branch mainline in revision 6003.
  • Revision ID: jriddell@canonical.com-20110624135759-263hx2et2kl1in39
change directory option to location argument

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__dirstate_helpers.py
34
34
    load_tests_apply_scenarios,
35
35
    multiply_scenarios,
36
36
    )
37
 
from bzrlib.tests import (
38
 
    features,
39
 
    )
40
37
 
41
38
 
42
39
load_tests = load_tests_apply_scenarios
43
40
 
44
41
 
45
 
compiled_dirstate_helpers_feature = features.ModuleAvailableFeature(
 
42
compiled_dirstate_helpers_feature = tests.ModuleAvailableFeature(
46
43
    'bzrlib._dirstate_helpers_pyx')
47
44
 
48
45
 
954
951
 
955
952
    def test_update_entry_symlink(self):
956
953
        """Update entry should read symlinks."""
957
 
        self.requireFeature(features.SymlinkFeature)
 
954
        self.requireFeature(tests.SymlinkFeature)
958
955
        state, entry = self.get_state_with_a()
959
956
        state.save()
960
957
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1151
1148
 
1152
1149
    def test_update_file_to_symlink(self):
1153
1150
        """File becomes a symlink"""
1154
 
        self.requireFeature(features.SymlinkFeature)
 
1151
        self.requireFeature(tests.SymlinkFeature)
1155
1152
        state, entry = self.get_state_with_a()
1156
1153
        # The file sha1 won't be cached unless the file is old
1157
1154
        state.adjust_time(+10)
1170
1167
 
1171
1168
    def test_update_dir_to_symlink(self):
1172
1169
        """Directory becomes a symlink"""
1173
 
        self.requireFeature(features.SymlinkFeature)
 
1170
        self.requireFeature(tests.SymlinkFeature)
1174
1171
        state, entry = self.get_state_with_a()
1175
1172
        # The symlink target won't be cached if it isn't old
1176
1173
        state.adjust_time(+10)
1180
1177
 
1181
1178
    def test_update_symlink_to_file(self):
1182
1179
        """Symlink becomes a file"""
1183
 
        self.requireFeature(features.SymlinkFeature)
 
1180
        self.requireFeature(tests.SymlinkFeature)
1184
1181
        state, entry = self.get_state_with_a()
1185
1182
        # The symlink and file info won't be cached unless old
1186
1183
        state.adjust_time(+10)
1190
1187
 
1191
1188
    def test_update_symlink_to_dir(self):
1192
1189
        """Symlink becomes a directory"""
1193
 
        self.requireFeature(features.SymlinkFeature)
 
1190
        self.requireFeature(tests.SymlinkFeature)
1194
1191
        state, entry = self.get_state_with_a()
1195
1192
        # The symlink target won't be cached if it isn't old
1196
1193
        state.adjust_time(+10)