← 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: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__dirstate_helpers.py
1
 
# Copyright (C) 2007-2011 Canonical Ltd
 
1
# Copyright (C) 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
28
28
    )
29
29
from bzrlib.tests import (
30
30
    test_dirstate,
31
 
    )
32
 
from bzrlib.tests.test_osutils import dir_reader_scenarios
33
 
from bzrlib.tests.scenarios import (
34
 
    load_tests_apply_scenarios,
35
 
    multiply_scenarios,
36
 
    )
37
 
from bzrlib.tests import (
38
 
    features,
39
 
    )
40
 
 
41
 
 
42
 
load_tests = load_tests_apply_scenarios
43
 
 
44
 
 
45
 
compiled_dirstate_helpers_feature = features.ModuleAvailableFeature(
46
 
    'bzrlib._dirstate_helpers_pyx')
47
 
 
48
 
 
49
 
# FIXME: we should also parametrize against SHA1Provider !
50
 
 
51
 
ue_scenarios = [('dirstate_Python',
52
 
    {'update_entry': dirstate.py_update_entry})]
53
 
if compiled_dirstate_helpers_feature.available():
54
 
    update_entry = compiled_dirstate_helpers_feature.module.update_entry
55
 
    ue_scenarios.append(('dirstate_Pyrex', {'update_entry': update_entry}))
56
 
 
57
 
pe_scenarios = [('dirstate_Python',
58
 
    {'_process_entry': dirstate.ProcessEntryPython})]
59
 
if compiled_dirstate_helpers_feature.available():
60
 
    process_entry = compiled_dirstate_helpers_feature.module.ProcessEntryC
61
 
    pe_scenarios.append(('dirstate_Pyrex', {'_process_entry': process_entry}))
 
31
    test_osutils,
 
32
    )
 
33
 
 
34
try:
 
35
    from bzrlib import _dirstate_helpers_pyx
 
36
    has_dirstate_helpers_pyx = True
 
37
except ImportError:
 
38
    has_dirstate_helpers_pyx = False
 
39
 
 
40
 
 
41
compiled_dirstate_helpers_feature = tests.ModuleAvailableFeature(
 
42
                                'bzrlib._dirstate_helpers_pyx')
 
43
 
 
44
 
 
45
def load_tests(basic_tests, module, loader):
 
46
    # FIXME: we should also parametrize against SHA1Provider !
 
47
    suite = loader.suiteClass()
 
48
    remaining_tests = basic_tests
 
49
 
 
50
    dir_reader_scenarios = test_osutils.dir_reader_scenarios()
 
51
 
 
52
    ue_scenarios = [('dirstate_Python',
 
53
                     {'update_entry': dirstate.py_update_entry})]
 
54
    if compiled_dirstate_helpers_feature.available():
 
55
        update_entry = compiled_dirstate_helpers_feature.module.update_entry
 
56
        pyrex_scenario = ('dirstate_Pyrex', {'update_entry': update_entry})
 
57
        ue_scenarios.append(pyrex_scenario)
 
58
    process_entry_tests, remaining_tests = tests.split_suite_by_condition(
 
59
        remaining_tests, tests.condition_isinstance(TestUpdateEntry))
 
60
    tests.multiply_tests(process_entry_tests,
 
61
                         tests.multiply_scenarios(dir_reader_scenarios,
 
62
                                                  ue_scenarios),
 
63
                         suite)
 
64
 
 
65
    pe_scenarios = [('dirstate_Python',
 
66
                     {'_process_entry': dirstate.ProcessEntryPython})]
 
67
    if compiled_dirstate_helpers_feature.available():
 
68
        process_entry = compiled_dirstate_helpers_feature.module.ProcessEntryC
 
69
        pyrex_scenario = ('dirstate_Pyrex', {'_process_entry': process_entry})
 
70
        pe_scenarios.append(pyrex_scenario)
 
71
    process_entry_tests, remaining_tests = tests.split_suite_by_condition(
 
72
        remaining_tests, tests.condition_isinstance(TestProcessEntry))
 
73
    tests.multiply_tests(process_entry_tests,
 
74
                         tests.multiply_scenarios(dir_reader_scenarios,
 
75
                                                  pe_scenarios),
 
76
                         suite)
 
77
 
 
78
    dir_reader_tests, remaining_tests = tests.split_suite_by_condition(
 
79
        remaining_tests, tests.condition_isinstance(
 
80
            test_dirstate.TestCaseWithDirState))
 
81
    tests.multiply_tests(dir_reader_tests, dir_reader_scenarios, suite)
 
82
    suite.addTest(remaining_tests)
 
83
 
 
84
    return suite
62
85
 
63
86
 
64
87
class TestBisectPathMixin(object):
696
719
    implementation.
697
720
    """
698
721
 
699
 
    # inherits scenarios from test_dirstate
700
 
 
701
722
    def get_read_dirblocks(self):
702
723
        from bzrlib._dirstate_helpers_py import _read_dirblocks
703
724
        return _read_dirblocks
716
737
 
717
738
    def test_trailing_garbage(self):
718
739
        tree, state, expected = self.create_basic_dirstate()
719
 
        # On Unix, we can write extra data as long as we haven't read yet, but
 
740
        # On Linux, we can write extra data as long as we haven't read yet, but
720
741
        # on Win32, if you've opened the file with FILE_SHARE_READ, trying to
721
742
        # open it in append mode will fail.
722
743
        state.unlock()
805
826
class TestUpdateEntry(test_dirstate.TestCaseWithDirState):
806
827
    """Test the DirState.update_entry functions"""
807
828
 
808
 
    scenarios = multiply_scenarios(
809
 
        dir_reader_scenarios(), ue_scenarios)
810
 
 
811
829
    # Set by load_tests
812
830
    update_entry = None
813
831
 
814
832
    def setUp(self):
815
833
        super(TestUpdateEntry, self).setUp()
816
 
        self.overrideAttr(dirstate, 'update_entry', self.update_entry)
 
834
        orig = dirstate.update_entry
 
835
        def cleanup():
 
836
            dirstate.update_entry = orig
 
837
        self.addCleanup(cleanup)
 
838
        dirstate.update_entry = self.update_entry
817
839
 
818
840
    def get_state_with_a(self):
819
841
        """Create a DirState tracking a single object named 'a'"""
825
847
 
826
848
    def test_observed_sha1_cachable(self):
827
849
        state, entry = self.get_state_with_a()
828
 
        state.save()
829
850
        atime = time.time() - 10
830
851
        self.build_tree(['a'])
831
 
        statvalue = test_dirstate._FakeStat.from_stat(os.lstat('a'))
832
 
        statvalue.st_mtime = statvalue.st_ctime = atime
833
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
834
 
                         state._dirblock_state)
 
852
        statvalue = os.lstat('a')
 
853
        statvalue = test_dirstate._FakeStat(statvalue.st_size, atime, atime,
 
854
            statvalue.st_dev, statvalue.st_ino, statvalue.st_mode)
835
855
        state._observed_sha1(entry, "foo", statvalue)
836
856
        self.assertEqual('foo', entry[1][0][1])
837
857
        packed_stat = dirstate.pack_stat(statvalue)
838
858
        self.assertEqual(packed_stat, entry[1][0][4])
839
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
840
 
                         state._dirblock_state)
841
859
 
842
860
    def test_observed_sha1_not_cachable(self):
843
861
        state, entry = self.get_state_with_a()
844
 
        state.save()
845
862
        oldval = entry[1][0][1]
846
863
        oldstat = entry[1][0][4]
847
864
        self.build_tree(['a'])
848
865
        statvalue = os.lstat('a')
849
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
850
 
                         state._dirblock_state)
851
866
        state._observed_sha1(entry, "foo", statvalue)
852
867
        self.assertEqual(oldval, entry[1][0][1])
853
868
        self.assertEqual(oldstat, entry[1][0][4])
854
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
855
 
                         state._dirblock_state)
856
869
 
857
870
    def test_update_entry(self):
858
871
        state, _ = self.get_state_with_a()
883
896
                                          stat_value=stat_value)
884
897
        self.assertEqual(None, link_or_sha1)
885
898
 
886
 
        # The dirblock entry should not have computed or cached the file's
887
 
        # sha1, but it did update the files' st_size. However, this is not
888
 
        # worth writing a dirstate file for, so we leave the state UNMODIFIED
 
899
        # The dirblock entry should not have cached the file's sha1 (too new)
889
900
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
890
901
                         entry[1][0])
891
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
902
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
892
903
                         state._dirblock_state)
893
904
        mode = stat_value.st_mode
894
905
        self.assertEqual([('is_exec', mode, False)], state._log)
897
908
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
898
909
                         state._dirblock_state)
899
910
 
900
 
        # Roll the clock back so the file is guaranteed to look too new. We
901
 
        # should still not compute the sha1.
 
911
        # If we do it again right away, we don't know if the file has changed
 
912
        # so we will re-read the file. Roll the clock back so the file is
 
913
        # guaranteed to look too new.
902
914
        state.adjust_time(-10)
903
915
        del state._log[:]
904
916
 
906
918
                                          stat_value=stat_value)
907
919
        self.assertEqual([('is_exec', mode, False)], state._log)
908
920
        self.assertEqual(None, link_or_sha1)
909
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
921
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
910
922
                         state._dirblock_state)
911
923
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
912
924
                         entry[1][0])
922
934
        self.assertEqual([('is_exec', mode, False)], state._log)
923
935
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
924
936
                         entry[1][0])
925
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
926
 
                         state._dirblock_state)
927
937
 
928
938
        # If the file is no longer new, and the clock has been moved forward
929
939
        # sufficiently, it will cache the sha.
954
964
 
955
965
    def test_update_entry_symlink(self):
956
966
        """Update entry should read symlinks."""
957
 
        self.requireFeature(features.SymlinkFeature)
 
967
        self.requireFeature(tests.SymlinkFeature)
958
968
        state, entry = self.get_state_with_a()
959
969
        state.save()
960
970
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
971
981
        # Dirblock is not updated (the link is too new)
972
982
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
973
983
                         entry[1])
974
 
        # The file entry turned into a symlink, that is considered
975
 
        # HASH modified worthy.
976
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
 
984
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
977
985
                         state._dirblock_state)
978
986
 
979
987
        # Because the stat_value looks new, we should re-read the target
980
 
        del state._log[:]
981
988
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
982
989
                                          stat_value=stat_value)
983
990
        self.assertEqual('target', link_or_sha1)
984
 
        self.assertEqual([('read_link', 'a', '')], state._log)
 
991
        self.assertEqual([('read_link', 'a', ''),
 
992
                          ('read_link', 'a', ''),
 
993
                         ], state._log)
985
994
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
986
995
                         entry[1])
987
 
        state.save()
988
996
        state.adjust_time(+20) # Skip into the future, all files look old
989
 
        del state._log[:]
990
997
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
991
998
                                          stat_value=stat_value)
992
 
        # The symlink stayed a symlink. So while it is new enough to cache, we
993
 
        # don't bother setting the flag, because it is not really worth saving
994
 
        # (when we stat the symlink, we'll have paged in the target.)
995
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
996
 
                         state._dirblock_state)
997
999
        self.assertEqual('target', link_or_sha1)
998
1000
        # We need to re-read the link because only now can we cache it
999
 
        self.assertEqual([('read_link', 'a', '')], state._log)
 
1001
        self.assertEqual([('read_link', 'a', ''),
 
1002
                          ('read_link', 'a', ''),
 
1003
                          ('read_link', 'a', ''),
 
1004
                         ], state._log)
1000
1005
        self.assertEqual([('l', 'target', 6, False, packed_stat)],
1001
1006
                         entry[1])
1002
1007
 
1003
 
        del state._log[:]
1004
1008
        # Another call won't re-read the link
1005
 
        self.assertEqual([], state._log)
 
1009
        self.assertEqual([('read_link', 'a', ''),
 
1010
                          ('read_link', 'a', ''),
 
1011
                          ('read_link', 'a', ''),
 
1012
                         ], state._log)
1006
1013
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
1007
1014
                                          stat_value=stat_value)
1008
1015
        self.assertEqual('target', link_or_sha1)
1023
1030
        self.build_tree(['a/'])
1024
1031
        state.adjust_time(+20)
1025
1032
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
1026
 
        # a/ used to be a file, but is now a directory, worth saving
1027
1033
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1028
1034
                         state._dirblock_state)
1029
1035
        state.save()
1030
1036
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1031
1037
                         state._dirblock_state)
1032
 
        # No changes to a/ means not worth saving.
1033
 
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
1034
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1035
 
                         state._dirblock_state)
1036
 
        # Change the last-modified time for the directory
1037
 
        t = time.time() - 100.0
1038
 
        try:
1039
 
            os.utime('a', (t, t))
1040
 
        except OSError:
1041
 
            # It looks like Win32 + FAT doesn't allow to change times on a dir.
1042
 
            raise tests.TestSkipped("can't update mtime of a dir on FAT")
1043
 
        saved_packed_stat = entry[1][0][-1]
1044
 
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
1045
 
        # We *do* go ahead and update the information in the dirblocks, but we
1046
 
        # don't bother setting IN_MEMORY_MODIFIED because it is trivial to
1047
 
        # recompute.
1048
 
        self.assertNotEqual(saved_packed_stat, entry[1][0][-1])
 
1038
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
1049
1039
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1050
1040
                         state._dirblock_state)
1051
1041
 
1151
1141
 
1152
1142
    def test_update_file_to_symlink(self):
1153
1143
        """File becomes a symlink"""
1154
 
        self.requireFeature(features.SymlinkFeature)
 
1144
        self.requireFeature(tests.SymlinkFeature)
1155
1145
        state, entry = self.get_state_with_a()
1156
1146
        # The file sha1 won't be cached unless the file is old
1157
1147
        state.adjust_time(+10)
1170
1160
 
1171
1161
    def test_update_dir_to_symlink(self):
1172
1162
        """Directory becomes a symlink"""
1173
 
        self.requireFeature(features.SymlinkFeature)
 
1163
        self.requireFeature(tests.SymlinkFeature)
1174
1164
        state, entry = self.get_state_with_a()
1175
1165
        # The symlink target won't be cached if it isn't old
1176
1166
        state.adjust_time(+10)
1180
1170
 
1181
1171
    def test_update_symlink_to_file(self):
1182
1172
        """Symlink becomes a file"""
1183
 
        self.requireFeature(features.SymlinkFeature)
 
1173
        self.requireFeature(tests.SymlinkFeature)
1184
1174
        state, entry = self.get_state_with_a()
1185
1175
        # The symlink and file info won't be cached unless old
1186
1176
        state.adjust_time(+10)
1190
1180
 
1191
1181
    def test_update_symlink_to_dir(self):
1192
1182
        """Symlink becomes a directory"""
1193
 
        self.requireFeature(features.SymlinkFeature)
 
1183
        self.requireFeature(tests.SymlinkFeature)
1194
1184
        state, entry = self.get_state_with_a()
1195
1185
        # The symlink target won't be cached if it isn't old
1196
1186
        state.adjust_time(+10)
1283
1273
 
1284
1274
class TestProcessEntry(test_dirstate.TestCaseWithDirState):
1285
1275
 
1286
 
    scenarios = multiply_scenarios(dir_reader_scenarios(), pe_scenarios)
1287
 
 
1288
1276
    # Set by load_tests
1289
1277
    _process_entry = None
1290
1278
 
1291
1279
    def setUp(self):
1292
1280
        super(TestProcessEntry, self).setUp()
1293
 
        self.overrideAttr(dirstate, '_process_entry', self._process_entry)
 
1281
        orig = dirstate._process_entry
 
1282
        def cleanup():
 
1283
            dirstate._process_entry = orig
 
1284
        self.addCleanup(cleanup)
 
1285
        dirstate._process_entry = self._process_entry
1294
1286
 
1295
1287
    def assertChangedFileIds(self, expected, tree):
1296
1288
        tree.lock_read()
1305
1297
        # This is a direct test of bug #495023, it relies on osutils.is_inside
1306
1298
        # getting called in an inner function. Which makes it a bit brittle,
1307
1299
        # but at least it does reproduce the bug.
 
1300
        def is_inside_raises(*args, **kwargs):
 
1301
            raise RuntimeError('stop this')
1308
1302
        tree = self.make_branch_and_tree('tree')
1309
1303
        self.build_tree(['tree/file', 'tree/dir/', 'tree/dir/sub',
1310
1304
                         'tree/dir2/', 'tree/dir2/sub2'])
1313
1307
        tree.lock_read()
1314
1308
        self.addCleanup(tree.unlock)
1315
1309
        basis_tree = tree.basis_tree()
1316
 
        def is_inside_raises(*args, **kwargs):
1317
 
            raise RuntimeError('stop this')
1318
 
        self.overrideAttr(osutils, 'is_inside', is_inside_raises)
 
1310
        orig = osutils.is_inside
 
1311
        self.addCleanup(setattr, osutils, 'is_inside', orig)
 
1312
        osutils.is_inside = is_inside_raises
1319
1313
        self.assertListRaises(RuntimeError, tree.iter_changes, basis_tree)
1320
1314
 
1321
1315
    def test_simple_changes(self):