← 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: Canonical.com Patch Queue Manager
  • Date: 2011-07-16 10:47:45 UTC
  • mfrom: (6027.1.7 deprecations)
  • Revision ID: pqm@pqm.ubuntu.com-20110716104745-8n8mgnn7ld7dcf8w
(vila) Remove commands, diff and trace deprecated stuff (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__dirstate_helpers.py
1
 
# Copyright (C) 2007-2010 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
28
28
    )
29
29
from bzrlib.tests import (
30
30
    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
 
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
 
 
38
 
 
39
load_tests = load_tests_apply_scenarios
39
40
 
40
41
 
41
42
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
 
43
    'bzrlib._dirstate_helpers_pyx')
 
44
 
 
45
 
 
46
# FIXME: we should also parametrize against SHA1Provider !
 
47
 
 
48
ue_scenarios = [('dirstate_Python',
 
49
    {'update_entry': dirstate.py_update_entry})]
 
50
if compiled_dirstate_helpers_feature.available():
 
51
    update_entry = compiled_dirstate_helpers_feature.module.update_entry
 
52
    ue_scenarios.append(('dirstate_Pyrex', {'update_entry': update_entry}))
 
53
 
 
54
pe_scenarios = [('dirstate_Python',
 
55
    {'_process_entry': dirstate.ProcessEntryPython})]
 
56
if compiled_dirstate_helpers_feature.available():
 
57
    process_entry = compiled_dirstate_helpers_feature.module.ProcessEntryC
 
58
    pe_scenarios.append(('dirstate_Pyrex', {'_process_entry': process_entry}))
85
59
 
86
60
 
87
61
class TestBisectPathMixin(object):
719
693
    implementation.
720
694
    """
721
695
 
 
696
    # inherits scenarios from test_dirstate
 
697
 
722
698
    def get_read_dirblocks(self):
723
699
        from bzrlib._dirstate_helpers_py import _read_dirblocks
724
700
        return _read_dirblocks
826
802
class TestUpdateEntry(test_dirstate.TestCaseWithDirState):
827
803
    """Test the DirState.update_entry functions"""
828
804
 
 
805
    scenarios = multiply_scenarios(
 
806
        dir_reader_scenarios(), ue_scenarios)
 
807
 
829
808
    # Set by load_tests
830
809
    update_entry = None
831
810
 
843
822
 
844
823
    def test_observed_sha1_cachable(self):
845
824
        state, entry = self.get_state_with_a()
 
825
        state.save()
846
826
        atime = time.time() - 10
847
827
        self.build_tree(['a'])
848
 
        statvalue = os.lstat('a')
849
 
        statvalue = test_dirstate._FakeStat(statvalue.st_size, atime, atime,
850
 
            statvalue.st_dev, statvalue.st_ino, statvalue.st_mode)
 
828
        statvalue = test_dirstate._FakeStat.from_stat(os.lstat('a'))
 
829
        statvalue.st_mtime = statvalue.st_ctime = atime
 
830
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
831
                         state._dirblock_state)
851
832
        state._observed_sha1(entry, "foo", statvalue)
852
833
        self.assertEqual('foo', entry[1][0][1])
853
834
        packed_stat = dirstate.pack_stat(statvalue)
854
835
        self.assertEqual(packed_stat, entry[1][0][4])
 
836
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
 
837
                         state._dirblock_state)
855
838
 
856
839
    def test_observed_sha1_not_cachable(self):
857
840
        state, entry = self.get_state_with_a()
 
841
        state.save()
858
842
        oldval = entry[1][0][1]
859
843
        oldstat = entry[1][0][4]
860
844
        self.build_tree(['a'])
861
845
        statvalue = os.lstat('a')
 
846
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
847
                         state._dirblock_state)
862
848
        state._observed_sha1(entry, "foo", statvalue)
863
849
        self.assertEqual(oldval, entry[1][0][1])
864
850
        self.assertEqual(oldstat, entry[1][0][4])
 
851
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
852
                         state._dirblock_state)
865
853
 
866
854
    def test_update_entry(self):
867
855
        state, _ = self.get_state_with_a()
892
880
                                          stat_value=stat_value)
893
881
        self.assertEqual(None, link_or_sha1)
894
882
 
895
 
        # The dirblock entry should not have cached the file's sha1 (too new)
 
883
        # The dirblock entry should not have computed or cached the file's
 
884
        # sha1, but it did update the files' st_size. However, this is not
 
885
        # worth writing a dirstate file for, so we leave the state UNMODIFIED
896
886
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
897
887
                         entry[1][0])
898
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
888
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
899
889
                         state._dirblock_state)
900
890
        mode = stat_value.st_mode
901
891
        self.assertEqual([('is_exec', mode, False)], state._log)
904
894
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
905
895
                         state._dirblock_state)
906
896
 
907
 
        # If we do it again right away, we don't know if the file has changed
908
 
        # so we will re-read the file. Roll the clock back so the file is
909
 
        # guaranteed to look too new.
 
897
        # Roll the clock back so the file is guaranteed to look too new. We
 
898
        # should still not compute the sha1.
910
899
        state.adjust_time(-10)
911
900
        del state._log[:]
912
901
 
914
903
                                          stat_value=stat_value)
915
904
        self.assertEqual([('is_exec', mode, False)], state._log)
916
905
        self.assertEqual(None, link_or_sha1)
917
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
906
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
918
907
                         state._dirblock_state)
919
908
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
920
909
                         entry[1][0])
930
919
        self.assertEqual([('is_exec', mode, False)], state._log)
931
920
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
932
921
                         entry[1][0])
 
922
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
923
                         state._dirblock_state)
933
924
 
934
925
        # If the file is no longer new, and the clock has been moved forward
935
926
        # sufficiently, it will cache the sha.
977
968
        # Dirblock is not updated (the link is too new)
978
969
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
979
970
                         entry[1])
980
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
971
        # The file entry turned into a symlink, that is considered
 
972
        # HASH modified worthy.
 
973
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
981
974
                         state._dirblock_state)
982
975
 
983
976
        # Because the stat_value looks new, we should re-read the target
 
977
        del state._log[:]
984
978
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
985
979
                                          stat_value=stat_value)
986
980
        self.assertEqual('target', link_or_sha1)
987
 
        self.assertEqual([('read_link', 'a', ''),
988
 
                          ('read_link', 'a', ''),
989
 
                         ], state._log)
 
981
        self.assertEqual([('read_link', 'a', '')], state._log)
990
982
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
991
983
                         entry[1])
 
984
        state.save()
992
985
        state.adjust_time(+20) # Skip into the future, all files look old
 
986
        del state._log[:]
993
987
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
994
988
                                          stat_value=stat_value)
 
989
        # The symlink stayed a symlink. So while it is new enough to cache, we
 
990
        # don't bother setting the flag, because it is not really worth saving
 
991
        # (when we stat the symlink, we'll have paged in the target.)
 
992
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
993
                         state._dirblock_state)
995
994
        self.assertEqual('target', link_or_sha1)
996
995
        # We need to re-read the link because only now can we cache it
997
 
        self.assertEqual([('read_link', 'a', ''),
998
 
                          ('read_link', 'a', ''),
999
 
                          ('read_link', 'a', ''),
1000
 
                         ], state._log)
 
996
        self.assertEqual([('read_link', 'a', '')], state._log)
1001
997
        self.assertEqual([('l', 'target', 6, False, packed_stat)],
1002
998
                         entry[1])
1003
999
 
 
1000
        del state._log[:]
1004
1001
        # Another call won't re-read the link
1005
 
        self.assertEqual([('read_link', 'a', ''),
1006
 
                          ('read_link', 'a', ''),
1007
 
                          ('read_link', 'a', ''),
1008
 
                         ], state._log)
 
1002
        self.assertEqual([], state._log)
1009
1003
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
1010
1004
                                          stat_value=stat_value)
1011
1005
        self.assertEqual('target', link_or_sha1)
1026
1020
        self.build_tree(['a/'])
1027
1021
        state.adjust_time(+20)
1028
1022
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1023
        # a/ used to be a file, but is now a directory, worth saving
1029
1024
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1030
1025
                         state._dirblock_state)
1031
1026
        state.save()
1032
1027
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1033
1028
                         state._dirblock_state)
1034
 
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1029
        # No changes to a/ means not worth saving.
 
1030
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1031
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1032
                         state._dirblock_state)
 
1033
        # Change the last-modified time for the directory
 
1034
        t = time.time() - 100.0
 
1035
        try:
 
1036
            os.utime('a', (t, t))
 
1037
        except OSError:
 
1038
            # It looks like Win32 + FAT doesn't allow to change times on a dir.
 
1039
            raise tests.TestSkipped("can't update mtime of a dir on FAT")
 
1040
        saved_packed_stat = entry[1][0][-1]
 
1041
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1042
        # We *do* go ahead and update the information in the dirblocks, but we
 
1043
        # don't bother setting IN_MEMORY_MODIFIED because it is trivial to
 
1044
        # recompute.
 
1045
        self.assertNotEqual(saved_packed_stat, entry[1][0][-1])
1035
1046
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1036
1047
                         state._dirblock_state)
1037
1048
 
1269
1280
 
1270
1281
class TestProcessEntry(test_dirstate.TestCaseWithDirState):
1271
1282
 
 
1283
    scenarios = multiply_scenarios(dir_reader_scenarios(), pe_scenarios)
 
1284
 
1272
1285
    # Set by load_tests
1273
1286
    _process_entry = None
1274
1287