← 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: Benoît Pierre
  • Date: 2009-11-02 22:24:29 UTC
  • mto: (4634.96.1 integration-2.0)
  • mto: This revision was merged to the branch mainline in revision 4798.
  • Revision ID: benoit.pierre@gmail.com-20091102222429-xqdyo6n8odh3xbbd
Small fix for handling of short option names in shellcomplete_on_options.

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 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
class _CompiledDirstateHelpersFeature(tests.Feature):
 
42
    def _probe(self):
 
43
        return has_dirstate_helpers_pyx
 
44
 
 
45
    def feature_name(self):
 
46
        return 'bzrlib._dirstate_helpers_pyx'
 
47
CompiledDirstateHelpersFeature = _CompiledDirstateHelpersFeature()
 
48
 
 
49
 
 
50
def load_tests(basic_tests, module, loader):
 
51
    # FIXME: we should also parametrize against SHA1Provider !
 
52
    suite = loader.suiteClass()
 
53
    remaining_tests = basic_tests
 
54
 
 
55
    dir_reader_scenarios = test_osutils.dir_reader_scenarios()
 
56
 
 
57
    ue_scenarios = [('dirstate_Python',
 
58
                     {'update_entry': dirstate.py_update_entry})]
 
59
    if has_dirstate_helpers_pyx:
 
60
        pyrex_scenario = ('dirstate_Pyrex',
 
61
                          {'update_entry': _dirstate_helpers_pyx.update_entry})
 
62
        ue_scenarios.append(pyrex_scenario)
 
63
    process_entry_tests, remaining_tests = tests.split_suite_by_condition(
 
64
        remaining_tests, tests.condition_isinstance(TestUpdateEntry))
 
65
    tests.multiply_tests(process_entry_tests,
 
66
                         tests.multiply_scenarios(dir_reader_scenarios,
 
67
                                                  ue_scenarios),
 
68
                         suite)
 
69
 
 
70
    pe_scenarios = [('dirstate_Python',
 
71
                     {'_process_entry': dirstate.ProcessEntryPython})]
 
72
    if has_dirstate_helpers_pyx:
 
73
        pyrex_scenario = (
 
74
            'dirstate_Pyrex',
 
75
            {'_process_entry': _dirstate_helpers_pyx.ProcessEntryC})
 
76
        pe_scenarios.append(pyrex_scenario)
 
77
    process_entry_tests, remaining_tests = tests.split_suite_by_condition(
 
78
        remaining_tests, tests.condition_isinstance(TestProcessEntry))
 
79
    tests.multiply_tests(process_entry_tests,
 
80
                         tests.multiply_scenarios(dir_reader_scenarios,
 
81
                                                  pe_scenarios),
 
82
                         suite)
 
83
 
 
84
    dir_reader_tests, remaining_tests = tests.split_suite_by_condition(
 
85
        remaining_tests, tests.condition_isinstance(
 
86
            test_dirstate.TestCaseWithDirState))
 
87
    tests.multiply_tests(dir_reader_tests, dir_reader_scenarios, suite)
 
88
    suite.addTest(remaining_tests)
 
89
 
 
90
    return suite
62
91
 
63
92
 
64
93
class TestBisectPathMixin(object):
230
259
class TestCompiledBisectPathLeft(TestBisectPathLeft):
231
260
    """Run all Bisect Path tests against _bisect_path_lect"""
232
261
 
233
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
262
    _test_needs_features = [CompiledDirstateHelpersFeature]
234
263
 
235
264
    def get_bisect_path(self):
236
265
        from bzrlib._dirstate_helpers_pyx import _bisect_path_left
251
280
class TestCompiledBisectPathRight(TestBisectPathRight):
252
281
    """Run all Bisect Path tests against _bisect_path_right"""
253
282
 
254
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
283
    _test_needs_features = [CompiledDirstateHelpersFeature]
255
284
 
256
285
    def get_bisect_path(self):
257
286
        from bzrlib._dirstate_helpers_pyx import _bisect_path_right
363
392
    compiled version.
364
393
    """
365
394
 
366
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
395
    _test_needs_features = [CompiledDirstateHelpersFeature]
367
396
 
368
397
    def get_bisect_dirblock(self):
369
398
        from bzrlib._dirstate_helpers_pyx import bisect_dirblock
485
514
class TestCompiledCmpByDirs(TestCmpByDirs):
486
515
    """Test the pyrex implementation of cmp_by_dirs"""
487
516
 
488
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
517
    _test_needs_features = [CompiledDirstateHelpersFeature]
489
518
 
490
519
    def get_cmp_by_dirs(self):
491
520
        from bzrlib._dirstate_helpers_pyx import cmp_by_dirs
636
665
class TestCompiledCmpPathByDirblock(TestCmpPathByDirblock):
637
666
    """Test the pyrex implementation of _cmp_path_by_dirblock"""
638
667
 
639
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
668
    _test_needs_features = [CompiledDirstateHelpersFeature]
640
669
 
641
670
    def get_cmp_by_dirs(self):
642
671
        from bzrlib._dirstate_helpers_pyx import _cmp_path_by_dirblock
646
675
class TestMemRChr(tests.TestCase):
647
676
    """Test memrchr functionality"""
648
677
 
649
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
678
    _test_needs_features = [CompiledDirstateHelpersFeature]
650
679
 
651
680
    def assertMemRChr(self, expected, s, c):
652
681
        from bzrlib._dirstate_helpers_pyx import _py_memrchr
696
725
    implementation.
697
726
    """
698
727
 
699
 
    # inherits scenarios from test_dirstate
700
 
 
701
728
    def get_read_dirblocks(self):
702
729
        from bzrlib._dirstate_helpers_py import _read_dirblocks
703
730
        return _read_dirblocks
716
743
 
717
744
    def test_trailing_garbage(self):
718
745
        tree, state, expected = self.create_basic_dirstate()
719
 
        # On Unix, we can write extra data as long as we haven't read yet, but
720
 
        # on Win32, if you've opened the file with FILE_SHARE_READ, trying to
721
 
        # open it in append mode will fail.
722
 
        state.unlock()
 
746
        # We can modify the file as long as it hasn't been read yet.
723
747
        f = open('dirstate', 'ab')
724
748
        try:
725
749
            # Add bogus trailing garbage
726
750
            f.write('bogus\n')
727
751
        finally:
728
752
            f.close()
729
 
            state.lock_read()
730
753
        e = self.assertRaises(errors.DirstateCorrupt,
731
754
                              state._read_dirblocks_if_needed)
732
755
        # Make sure we mention the bogus characters in the error
736
759
class TestCompiledReadDirblocks(TestReadDirblocks):
737
760
    """Test the pyrex implementation of _read_dirblocks"""
738
761
 
739
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
762
    _test_needs_features = [CompiledDirstateHelpersFeature]
740
763
 
741
764
    def get_read_dirblocks(self):
742
765
        from bzrlib._dirstate_helpers_pyx import _read_dirblocks
752
775
    """
753
776
 
754
777
    def test_bisect_dirblock(self):
755
 
        if compiled_dirstate_helpers_feature.available():
 
778
        if CompiledDirstateHelpersFeature.available():
756
779
            from bzrlib._dirstate_helpers_pyx import bisect_dirblock
757
780
        else:
758
781
            from bzrlib._dirstate_helpers_py import bisect_dirblock
759
782
        self.assertIs(bisect_dirblock, dirstate.bisect_dirblock)
760
783
 
761
784
    def test__bisect_path_left(self):
762
 
        if compiled_dirstate_helpers_feature.available():
 
785
        if CompiledDirstateHelpersFeature.available():
763
786
            from bzrlib._dirstate_helpers_pyx import _bisect_path_left
764
787
        else:
765
788
            from bzrlib._dirstate_helpers_py import _bisect_path_left
766
789
        self.assertIs(_bisect_path_left, dirstate._bisect_path_left)
767
790
 
768
791
    def test__bisect_path_right(self):
769
 
        if compiled_dirstate_helpers_feature.available():
 
792
        if CompiledDirstateHelpersFeature.available():
770
793
            from bzrlib._dirstate_helpers_pyx import _bisect_path_right
771
794
        else:
772
795
            from bzrlib._dirstate_helpers_py import _bisect_path_right
773
796
        self.assertIs(_bisect_path_right, dirstate._bisect_path_right)
774
797
 
775
798
    def test_cmp_by_dirs(self):
776
 
        if compiled_dirstate_helpers_feature.available():
 
799
        if CompiledDirstateHelpersFeature.available():
777
800
            from bzrlib._dirstate_helpers_pyx import cmp_by_dirs
778
801
        else:
779
802
            from bzrlib._dirstate_helpers_py import cmp_by_dirs
780
803
        self.assertIs(cmp_by_dirs, dirstate.cmp_by_dirs)
781
804
 
782
805
    def test__read_dirblocks(self):
783
 
        if compiled_dirstate_helpers_feature.available():
 
806
        if CompiledDirstateHelpersFeature.available():
784
807
            from bzrlib._dirstate_helpers_pyx import _read_dirblocks
785
808
        else:
786
809
            from bzrlib._dirstate_helpers_py import _read_dirblocks
787
810
        self.assertIs(_read_dirblocks, dirstate._read_dirblocks)
788
811
 
789
812
    def test_update_entry(self):
790
 
        if compiled_dirstate_helpers_feature.available():
 
813
        if CompiledDirstateHelpersFeature.available():
791
814
            from bzrlib._dirstate_helpers_pyx import update_entry
792
815
        else:
793
816
            from bzrlib.dirstate import update_entry
794
817
        self.assertIs(update_entry, dirstate.update_entry)
795
818
 
796
819
    def test_process_entry(self):
797
 
        if compiled_dirstate_helpers_feature.available():
 
820
        if CompiledDirstateHelpersFeature.available():
798
821
            from bzrlib._dirstate_helpers_pyx import ProcessEntryC
799
822
            self.assertIs(ProcessEntryC, dirstate._process_entry)
800
823
        else:
805
828
class TestUpdateEntry(test_dirstate.TestCaseWithDirState):
806
829
    """Test the DirState.update_entry functions"""
807
830
 
808
 
    scenarios = multiply_scenarios(
809
 
        dir_reader_scenarios(), ue_scenarios)
810
 
 
811
831
    # Set by load_tests
812
832
    update_entry = None
813
833
 
814
834
    def setUp(self):
815
835
        super(TestUpdateEntry, self).setUp()
816
 
        self.overrideAttr(dirstate, 'update_entry', self.update_entry)
 
836
        orig = dirstate.update_entry
 
837
        def cleanup():
 
838
            dirstate.update_entry = orig
 
839
        self.addCleanup(cleanup)
 
840
        dirstate.update_entry = self.update_entry
817
841
 
818
842
    def get_state_with_a(self):
819
843
        """Create a DirState tracking a single object named 'a'"""
825
849
 
826
850
    def test_observed_sha1_cachable(self):
827
851
        state, entry = self.get_state_with_a()
828
 
        state.save()
829
852
        atime = time.time() - 10
830
853
        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)
 
854
        statvalue = os.lstat('a')
 
855
        statvalue = test_dirstate._FakeStat(statvalue.st_size, atime, atime,
 
856
            statvalue.st_dev, statvalue.st_ino, statvalue.st_mode)
835
857
        state._observed_sha1(entry, "foo", statvalue)
836
858
        self.assertEqual('foo', entry[1][0][1])
837
859
        packed_stat = dirstate.pack_stat(statvalue)
838
860
        self.assertEqual(packed_stat, entry[1][0][4])
839
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
840
 
                         state._dirblock_state)
841
861
 
842
862
    def test_observed_sha1_not_cachable(self):
843
863
        state, entry = self.get_state_with_a()
844
 
        state.save()
845
864
        oldval = entry[1][0][1]
846
865
        oldstat = entry[1][0][4]
847
866
        self.build_tree(['a'])
848
867
        statvalue = os.lstat('a')
849
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
850
 
                         state._dirblock_state)
851
868
        state._observed_sha1(entry, "foo", statvalue)
852
869
        self.assertEqual(oldval, entry[1][0][1])
853
870
        self.assertEqual(oldstat, entry[1][0][4])
854
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
855
 
                         state._dirblock_state)
856
871
 
857
872
    def test_update_entry(self):
858
873
        state, _ = self.get_state_with_a()
883
898
                                          stat_value=stat_value)
884
899
        self.assertEqual(None, link_or_sha1)
885
900
 
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
 
901
        # The dirblock entry should not have cached the file's sha1 (too new)
889
902
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
890
903
                         entry[1][0])
891
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
904
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
892
905
                         state._dirblock_state)
893
906
        mode = stat_value.st_mode
894
907
        self.assertEqual([('is_exec', mode, False)], state._log)
897
910
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
898
911
                         state._dirblock_state)
899
912
 
900
 
        # Roll the clock back so the file is guaranteed to look too new. We
901
 
        # should still not compute the sha1.
 
913
        # If we do it again right away, we don't know if the file has changed
 
914
        # so we will re-read the file. Roll the clock back so the file is
 
915
        # guaranteed to look too new.
902
916
        state.adjust_time(-10)
903
917
        del state._log[:]
904
918
 
906
920
                                          stat_value=stat_value)
907
921
        self.assertEqual([('is_exec', mode, False)], state._log)
908
922
        self.assertEqual(None, link_or_sha1)
909
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
923
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
910
924
                         state._dirblock_state)
911
925
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
912
926
                         entry[1][0])
922
936
        self.assertEqual([('is_exec', mode, False)], state._log)
923
937
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
924
938
                         entry[1][0])
925
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
926
 
                         state._dirblock_state)
927
939
 
928
940
        # If the file is no longer new, and the clock has been moved forward
929
941
        # sufficiently, it will cache the sha.
954
966
 
955
967
    def test_update_entry_symlink(self):
956
968
        """Update entry should read symlinks."""
957
 
        self.requireFeature(features.SymlinkFeature)
 
969
        self.requireFeature(tests.SymlinkFeature)
958
970
        state, entry = self.get_state_with_a()
959
971
        state.save()
960
972
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
971
983
        # Dirblock is not updated (the link is too new)
972
984
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
973
985
                         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,
 
986
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
977
987
                         state._dirblock_state)
978
988
 
979
989
        # Because the stat_value looks new, we should re-read the target
980
 
        del state._log[:]
981
990
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
982
991
                                          stat_value=stat_value)
983
992
        self.assertEqual('target', link_or_sha1)
984
 
        self.assertEqual([('read_link', 'a', '')], state._log)
 
993
        self.assertEqual([('read_link', 'a', ''),
 
994
                          ('read_link', 'a', ''),
 
995
                         ], state._log)
985
996
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
986
997
                         entry[1])
987
 
        state.save()
988
998
        state.adjust_time(+20) # Skip into the future, all files look old
989
 
        del state._log[:]
990
999
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
991
1000
                                          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
1001
        self.assertEqual('target', link_or_sha1)
998
1002
        # We need to re-read the link because only now can we cache it
999
 
        self.assertEqual([('read_link', 'a', '')], state._log)
 
1003
        self.assertEqual([('read_link', 'a', ''),
 
1004
                          ('read_link', 'a', ''),
 
1005
                          ('read_link', 'a', ''),
 
1006
                         ], state._log)
1000
1007
        self.assertEqual([('l', 'target', 6, False, packed_stat)],
1001
1008
                         entry[1])
1002
1009
 
1003
 
        del state._log[:]
1004
1010
        # Another call won't re-read the link
1005
 
        self.assertEqual([], state._log)
 
1011
        self.assertEqual([('read_link', 'a', ''),
 
1012
                          ('read_link', 'a', ''),
 
1013
                          ('read_link', 'a', ''),
 
1014
                         ], state._log)
1006
1015
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
1007
1016
                                          stat_value=stat_value)
1008
1017
        self.assertEqual('target', link_or_sha1)
1023
1032
        self.build_tree(['a/'])
1024
1033
        state.adjust_time(+20)
1025
1034
        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
1035
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1028
1036
                         state._dirblock_state)
1029
1037
        state.save()
1030
1038
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1031
1039
                         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])
 
1040
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
1049
1041
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1050
1042
                         state._dirblock_state)
1051
1043
 
1151
1143
 
1152
1144
    def test_update_file_to_symlink(self):
1153
1145
        """File becomes a symlink"""
1154
 
        self.requireFeature(features.SymlinkFeature)
 
1146
        self.requireFeature(tests.SymlinkFeature)
1155
1147
        state, entry = self.get_state_with_a()
1156
1148
        # The file sha1 won't be cached unless the file is old
1157
1149
        state.adjust_time(+10)
1170
1162
 
1171
1163
    def test_update_dir_to_symlink(self):
1172
1164
        """Directory becomes a symlink"""
1173
 
        self.requireFeature(features.SymlinkFeature)
 
1165
        self.requireFeature(tests.SymlinkFeature)
1174
1166
        state, entry = self.get_state_with_a()
1175
1167
        # The symlink target won't be cached if it isn't old
1176
1168
        state.adjust_time(+10)
1180
1172
 
1181
1173
    def test_update_symlink_to_file(self):
1182
1174
        """Symlink becomes a file"""
1183
 
        self.requireFeature(features.SymlinkFeature)
 
1175
        self.requireFeature(tests.SymlinkFeature)
1184
1176
        state, entry = self.get_state_with_a()
1185
1177
        # The symlink and file info won't be cached unless old
1186
1178
        state.adjust_time(+10)
1190
1182
 
1191
1183
    def test_update_symlink_to_dir(self):
1192
1184
        """Symlink becomes a directory"""
1193
 
        self.requireFeature(features.SymlinkFeature)
 
1185
        self.requireFeature(tests.SymlinkFeature)
1194
1186
        state, entry = self.get_state_with_a()
1195
1187
        # The symlink target won't be cached if it isn't old
1196
1188
        state.adjust_time(+10)
1283
1275
 
1284
1276
class TestProcessEntry(test_dirstate.TestCaseWithDirState):
1285
1277
 
1286
 
    scenarios = multiply_scenarios(dir_reader_scenarios(), pe_scenarios)
1287
 
 
1288
1278
    # Set by load_tests
1289
1279
    _process_entry = None
1290
1280
 
1291
1281
    def setUp(self):
1292
1282
        super(TestProcessEntry, self).setUp()
1293
 
        self.overrideAttr(dirstate, '_process_entry', self._process_entry)
 
1283
        orig = dirstate._process_entry
 
1284
        def cleanup():
 
1285
            dirstate._process_entry = orig
 
1286
        self.addCleanup(cleanup)
 
1287
        dirstate._process_entry = self._process_entry
1294
1288
 
1295
1289
    def assertChangedFileIds(self, expected, tree):
1296
1290
        tree.lock_read()
1301
1295
            tree.unlock()
1302
1296
        self.assertEqual(sorted(expected), sorted(file_ids))
1303
1297
 
1304
 
    def test_exceptions_raised(self):
1305
 
        # This is a direct test of bug #495023, it relies on osutils.is_inside
1306
 
        # getting called in an inner function. Which makes it a bit brittle,
1307
 
        # but at least it does reproduce the bug.
1308
 
        tree = self.make_branch_and_tree('tree')
1309
 
        self.build_tree(['tree/file', 'tree/dir/', 'tree/dir/sub',
1310
 
                         'tree/dir2/', 'tree/dir2/sub2'])
1311
 
        tree.add(['file', 'dir', 'dir/sub', 'dir2', 'dir2/sub2'])
1312
 
        tree.commit('first commit')
1313
 
        tree.lock_read()
1314
 
        self.addCleanup(tree.unlock)
1315
 
        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)
1319
 
        self.assertListRaises(RuntimeError, tree.iter_changes, basis_tree)
1320
 
 
1321
1298
    def test_simple_changes(self):
1322
1299
        tree = self.make_branch_and_tree('tree')
1323
1300
        self.build_tree(['tree/file'])