← 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: Patch Queue Manager
  • Date: 2012-03-28 16:13:49 UTC
  • mfrom: (6499.2.3 948339-config-caching)
  • Revision ID: pqm@pqm.ubuntu.com-20120328161349-2gsc0g11fcu43hlc
(vila) Properly share mutable config sections and save the branch config
 only during the final unlock (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__dirstate_helpers.py
1
 
# Copyright (C) 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2007-2011 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
25
25
    errors,
26
26
    osutils,
27
27
    tests,
 
28
    _dirstate_helpers_py,
28
29
    )
29
30
from bzrlib.tests import (
30
31
    test_dirstate,
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
 
32
    )
 
33
from bzrlib.tests.test_osutils import dir_reader_scenarios
 
34
from bzrlib.tests.scenarios import (
 
35
    load_tests_apply_scenarios,
 
36
    multiply_scenarios,
 
37
    )
 
38
from bzrlib.tests import (
 
39
    features,
 
40
    )
 
41
 
 
42
 
 
43
load_tests = load_tests_apply_scenarios
 
44
 
 
45
 
 
46
compiled_dirstate_helpers_feature = features.ModuleAvailableFeature(
 
47
    'bzrlib._dirstate_helpers_pyx')
 
48
 
 
49
 
 
50
# FIXME: we should also parametrize against SHA1Provider !
 
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
    ue_scenarios.append(('dirstate_Pyrex', {'update_entry': update_entry}))
 
57
 
 
58
pe_scenarios = [('dirstate_Python',
 
59
    {'_process_entry': dirstate.ProcessEntryPython})]
 
60
if compiled_dirstate_helpers_feature.available():
 
61
    process_entry = compiled_dirstate_helpers_feature.module.ProcessEntryC
 
62
    pe_scenarios.append(('dirstate_Pyrex', {'_process_entry': process_entry}))
 
63
 
 
64
helper_scenarios = [('dirstate_Python', {'helpers': _dirstate_helpers_py})]
 
65
if compiled_dirstate_helpers_feature.available():
 
66
    helper_scenarios.append(('dirstate_Pyrex',
 
67
        {'helpers': compiled_dirstate_helpers_feature.module}))
85
68
 
86
69
 
87
70
class TestBisectPathMixin(object):
719
702
    implementation.
720
703
    """
721
704
 
 
705
    # inherits scenarios from test_dirstate
 
706
 
722
707
    def get_read_dirblocks(self):
723
708
        from bzrlib._dirstate_helpers_py import _read_dirblocks
724
709
        return _read_dirblocks
737
722
 
738
723
    def test_trailing_garbage(self):
739
724
        tree, state, expected = self.create_basic_dirstate()
740
 
        # On Linux, we can write extra data as long as we haven't read yet, but
 
725
        # On Unix, we can write extra data as long as we haven't read yet, but
741
726
        # on Win32, if you've opened the file with FILE_SHARE_READ, trying to
742
727
        # open it in append mode will fail.
743
728
        state.unlock()
826
811
class TestUpdateEntry(test_dirstate.TestCaseWithDirState):
827
812
    """Test the DirState.update_entry functions"""
828
813
 
 
814
    scenarios = multiply_scenarios(
 
815
        dir_reader_scenarios(), ue_scenarios)
 
816
 
829
817
    # Set by load_tests
830
818
    update_entry = None
831
819
 
832
820
    def setUp(self):
833
821
        super(TestUpdateEntry, self).setUp()
834
 
        orig = dirstate.update_entry
835
 
        def cleanup():
836
 
            dirstate.update_entry = orig
837
 
        self.addCleanup(cleanup)
838
 
        dirstate.update_entry = self.update_entry
 
822
        self.overrideAttr(dirstate, 'update_entry', self.update_entry)
839
823
 
840
824
    def get_state_with_a(self):
841
825
        """Create a DirState tracking a single object named 'a'"""
847
831
 
848
832
    def test_observed_sha1_cachable(self):
849
833
        state, entry = self.get_state_with_a()
 
834
        state.save()
850
835
        atime = time.time() - 10
851
836
        self.build_tree(['a'])
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)
 
837
        statvalue = test_dirstate._FakeStat.from_stat(os.lstat('a'))
 
838
        statvalue.st_mtime = statvalue.st_ctime = atime
 
839
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
840
                         state._dirblock_state)
855
841
        state._observed_sha1(entry, "foo", statvalue)
856
842
        self.assertEqual('foo', entry[1][0][1])
857
843
        packed_stat = dirstate.pack_stat(statvalue)
858
844
        self.assertEqual(packed_stat, entry[1][0][4])
 
845
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
 
846
                         state._dirblock_state)
859
847
 
860
848
    def test_observed_sha1_not_cachable(self):
861
849
        state, entry = self.get_state_with_a()
 
850
        state.save()
862
851
        oldval = entry[1][0][1]
863
852
        oldstat = entry[1][0][4]
864
853
        self.build_tree(['a'])
865
854
        statvalue = os.lstat('a')
 
855
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
856
                         state._dirblock_state)
866
857
        state._observed_sha1(entry, "foo", statvalue)
867
858
        self.assertEqual(oldval, entry[1][0][1])
868
859
        self.assertEqual(oldstat, entry[1][0][4])
 
860
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
861
                         state._dirblock_state)
869
862
 
870
863
    def test_update_entry(self):
871
864
        state, _ = self.get_state_with_a()
896
889
                                          stat_value=stat_value)
897
890
        self.assertEqual(None, link_or_sha1)
898
891
 
899
 
        # The dirblock entry should not have cached the file's sha1 (too new)
 
892
        # The dirblock entry should not have computed or cached the file's
 
893
        # sha1, but it did update the files' st_size. However, this is not
 
894
        # worth writing a dirstate file for, so we leave the state UNMODIFIED
900
895
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
901
896
                         entry[1][0])
902
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
897
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
903
898
                         state._dirblock_state)
904
899
        mode = stat_value.st_mode
905
900
        self.assertEqual([('is_exec', mode, False)], state._log)
908
903
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
909
904
                         state._dirblock_state)
910
905
 
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.
 
906
        # Roll the clock back so the file is guaranteed to look too new. We
 
907
        # should still not compute the sha1.
914
908
        state.adjust_time(-10)
915
909
        del state._log[:]
916
910
 
918
912
                                          stat_value=stat_value)
919
913
        self.assertEqual([('is_exec', mode, False)], state._log)
920
914
        self.assertEqual(None, link_or_sha1)
921
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
915
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
922
916
                         state._dirblock_state)
923
917
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
924
918
                         entry[1][0])
934
928
        self.assertEqual([('is_exec', mode, False)], state._log)
935
929
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
936
930
                         entry[1][0])
 
931
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
932
                         state._dirblock_state)
937
933
 
938
934
        # If the file is no longer new, and the clock has been moved forward
939
935
        # sufficiently, it will cache the sha.
964
960
 
965
961
    def test_update_entry_symlink(self):
966
962
        """Update entry should read symlinks."""
967
 
        self.requireFeature(tests.SymlinkFeature)
 
963
        self.requireFeature(features.SymlinkFeature)
968
964
        state, entry = self.get_state_with_a()
969
965
        state.save()
970
966
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
981
977
        # Dirblock is not updated (the link is too new)
982
978
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
983
979
                         entry[1])
984
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
980
        # The file entry turned into a symlink, that is considered
 
981
        # HASH modified worthy.
 
982
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
985
983
                         state._dirblock_state)
986
984
 
987
985
        # Because the stat_value looks new, we should re-read the target
 
986
        del state._log[:]
988
987
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
989
988
                                          stat_value=stat_value)
990
989
        self.assertEqual('target', link_or_sha1)
991
 
        self.assertEqual([('read_link', 'a', ''),
992
 
                          ('read_link', 'a', ''),
993
 
                         ], state._log)
 
990
        self.assertEqual([('read_link', 'a', '')], state._log)
994
991
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
995
992
                         entry[1])
 
993
        state.save()
996
994
        state.adjust_time(+20) # Skip into the future, all files look old
 
995
        del state._log[:]
997
996
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
998
997
                                          stat_value=stat_value)
 
998
        # The symlink stayed a symlink. So while it is new enough to cache, we
 
999
        # don't bother setting the flag, because it is not really worth saving
 
1000
        # (when we stat the symlink, we'll have paged in the target.)
 
1001
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1002
                         state._dirblock_state)
999
1003
        self.assertEqual('target', link_or_sha1)
1000
1004
        # We need to re-read the link because only now can we cache it
1001
 
        self.assertEqual([('read_link', 'a', ''),
1002
 
                          ('read_link', 'a', ''),
1003
 
                          ('read_link', 'a', ''),
1004
 
                         ], state._log)
 
1005
        self.assertEqual([('read_link', 'a', '')], state._log)
1005
1006
        self.assertEqual([('l', 'target', 6, False, packed_stat)],
1006
1007
                         entry[1])
1007
1008
 
 
1009
        del state._log[:]
1008
1010
        # Another call won't re-read the link
1009
 
        self.assertEqual([('read_link', 'a', ''),
1010
 
                          ('read_link', 'a', ''),
1011
 
                          ('read_link', 'a', ''),
1012
 
                         ], state._log)
 
1011
        self.assertEqual([], state._log)
1013
1012
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
1014
1013
                                          stat_value=stat_value)
1015
1014
        self.assertEqual('target', link_or_sha1)
1030
1029
        self.build_tree(['a/'])
1031
1030
        state.adjust_time(+20)
1032
1031
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1032
        # a/ used to be a file, but is now a directory, worth saving
1033
1033
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1034
1034
                         state._dirblock_state)
1035
1035
        state.save()
1036
1036
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1037
1037
                         state._dirblock_state)
1038
 
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1038
        # No changes to a/ means not worth saving.
 
1039
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1040
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1041
                         state._dirblock_state)
 
1042
        # Change the last-modified time for the directory
 
1043
        t = time.time() - 100.0
 
1044
        try:
 
1045
            os.utime('a', (t, t))
 
1046
        except OSError:
 
1047
            # It looks like Win32 + FAT doesn't allow to change times on a dir.
 
1048
            raise tests.TestSkipped("can't update mtime of a dir on FAT")
 
1049
        saved_packed_stat = entry[1][0][-1]
 
1050
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1051
        # We *do* go ahead and update the information in the dirblocks, but we
 
1052
        # don't bother setting IN_MEMORY_MODIFIED because it is trivial to
 
1053
        # recompute.
 
1054
        self.assertNotEqual(saved_packed_stat, entry[1][0][-1])
1039
1055
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1040
1056
                         state._dirblock_state)
1041
1057
 
1141
1157
 
1142
1158
    def test_update_file_to_symlink(self):
1143
1159
        """File becomes a symlink"""
1144
 
        self.requireFeature(tests.SymlinkFeature)
 
1160
        self.requireFeature(features.SymlinkFeature)
1145
1161
        state, entry = self.get_state_with_a()
1146
1162
        # The file sha1 won't be cached unless the file is old
1147
1163
        state.adjust_time(+10)
1160
1176
 
1161
1177
    def test_update_dir_to_symlink(self):
1162
1178
        """Directory becomes a symlink"""
1163
 
        self.requireFeature(tests.SymlinkFeature)
 
1179
        self.requireFeature(features.SymlinkFeature)
1164
1180
        state, entry = self.get_state_with_a()
1165
1181
        # The symlink target won't be cached if it isn't old
1166
1182
        state.adjust_time(+10)
1170
1186
 
1171
1187
    def test_update_symlink_to_file(self):
1172
1188
        """Symlink becomes a file"""
1173
 
        self.requireFeature(tests.SymlinkFeature)
 
1189
        self.requireFeature(features.SymlinkFeature)
1174
1190
        state, entry = self.get_state_with_a()
1175
1191
        # The symlink and file info won't be cached unless old
1176
1192
        state.adjust_time(+10)
1180
1196
 
1181
1197
    def test_update_symlink_to_dir(self):
1182
1198
        """Symlink becomes a directory"""
1183
 
        self.requireFeature(tests.SymlinkFeature)
 
1199
        self.requireFeature(features.SymlinkFeature)
1184
1200
        state, entry = self.get_state_with_a()
1185
1201
        # The symlink target won't be cached if it isn't old
1186
1202
        state.adjust_time(+10)
1273
1289
 
1274
1290
class TestProcessEntry(test_dirstate.TestCaseWithDirState):
1275
1291
 
 
1292
    scenarios = multiply_scenarios(dir_reader_scenarios(), pe_scenarios)
 
1293
 
1276
1294
    # Set by load_tests
1277
1295
    _process_entry = None
1278
1296
 
1279
1297
    def setUp(self):
1280
1298
        super(TestProcessEntry, self).setUp()
1281
 
        orig = dirstate._process_entry
1282
 
        def cleanup():
1283
 
            dirstate._process_entry = orig
1284
 
        self.addCleanup(cleanup)
1285
 
        dirstate._process_entry = self._process_entry
 
1299
        self.overrideAttr(dirstate, '_process_entry', self._process_entry)
1286
1300
 
1287
1301
    def assertChangedFileIds(self, expected, tree):
1288
1302
        tree.lock_read()
1297
1311
        # This is a direct test of bug #495023, it relies on osutils.is_inside
1298
1312
        # getting called in an inner function. Which makes it a bit brittle,
1299
1313
        # but at least it does reproduce the bug.
1300
 
        def is_inside_raises(*args, **kwargs):
1301
 
            raise RuntimeError('stop this')
1302
1314
        tree = self.make_branch_and_tree('tree')
1303
1315
        self.build_tree(['tree/file', 'tree/dir/', 'tree/dir/sub',
1304
1316
                         'tree/dir2/', 'tree/dir2/sub2'])
1307
1319
        tree.lock_read()
1308
1320
        self.addCleanup(tree.unlock)
1309
1321
        basis_tree = tree.basis_tree()
1310
 
        orig = osutils.is_inside
1311
 
        self.addCleanup(setattr, osutils, 'is_inside', orig)
1312
 
        osutils.is_inside = is_inside_raises
 
1322
        def is_inside_raises(*args, **kwargs):
 
1323
            raise RuntimeError('stop this')
 
1324
        self.overrideAttr(osutils, 'is_inside', is_inside_raises)
1313
1325
        self.assertListRaises(RuntimeError, tree.iter_changes, basis_tree)
1314
1326
 
1315
1327
    def test_simple_changes(self):
1331
1343
        state._sha1_provider = UppercaseSHA1Provider()
1332
1344
        self.assertChangedFileIds(['file-id'], tree)
1333
1345
 
 
1346
 
 
1347
class TestPackStat(tests.TestCase):
 
1348
    """Check packed representaton of stat values is robust on all inputs"""
 
1349
 
 
1350
    scenarios = helper_scenarios
 
1351
 
 
1352
    def pack(self, statlike_tuple):
 
1353
        return self.helpers.pack_stat(os.stat_result(statlike_tuple))
 
1354
 
 
1355
    @staticmethod
 
1356
    def unpack_field(packed_string, stat_field):
 
1357
        return _dirstate_helpers_py._unpack_stat(packed_string)[stat_field]
 
1358
 
 
1359
    def test_result(self):
 
1360
        self.assertEqual("AAAQAAAAABAAAAARAAAAAgAAAAEAAIHk",
 
1361
            self.pack((33252, 1, 2, 0, 0, 0, 4096, 15.5, 16.5, 17.5)))
 
1362
 
 
1363
    def test_giant_inode(self):
 
1364
        packed = self.pack((33252, 0xF80000ABC, 0, 0, 0, 0, 0, 0, 0, 0))
 
1365
        self.assertEqual(0x80000ABC, self.unpack_field(packed, "st_ino"))
 
1366
 
 
1367
    def test_giant_size(self):
 
1368
        packed = self.pack((33252, 0, 0, 0, 0, 0, (1 << 33) + 4096, 0, 0, 0))
 
1369
        self.assertEqual(4096, self.unpack_field(packed, "st_size"))
 
1370
 
 
1371
    def test_fractional_mtime(self):
 
1372
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, 16.9375, 0))
 
1373
        self.assertEqual(16, self.unpack_field(packed, "st_mtime"))
 
1374
 
 
1375
    def test_ancient_mtime(self):
 
1376
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, -11644473600.0, 0))
 
1377
        self.assertEqual(1240428288, self.unpack_field(packed, "st_mtime"))
 
1378
 
 
1379
    def test_distant_mtime(self):
 
1380
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, 64060588800.0, 0))
 
1381
        self.assertEqual(3931046656, self.unpack_field(packed, "st_mtime"))
 
1382
 
 
1383
    def test_fractional_ctime(self):
 
1384
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, 0, 17.5625))
 
1385
        self.assertEqual(17, self.unpack_field(packed, "st_ctime"))
 
1386
 
 
1387
    def test_ancient_ctime(self):
 
1388
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, 0, -11644473600.0))
 
1389
        self.assertEqual(1240428288, self.unpack_field(packed, "st_ctime"))
 
1390
 
 
1391
    def test_distant_ctime(self):
 
1392
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, 0, 64060588800.0))
 
1393
        self.assertEqual(3931046656, self.unpack_field(packed, "st_ctime"))
 
1394
 
 
1395
    def test_negative_dev(self):
 
1396
        packed = self.pack((33252, 0, -0xFFFFFCDE, 0, 0, 0, 0, 0, 0, 0))
 
1397
        self.assertEqual(0x322, self.unpack_field(packed, "st_dev"))