/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__dirstate_helpers.py

  • Committer: Vincent Ladeuil
  • Date: 2010-01-25 17:48:22 UTC
  • mto: (4987.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100125174822-nce4l19sbwx83jvq
Deploying the new overrideAttr facility further reduces the complexity
and make the code clearer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__dirstate_helpers.py
831
831
 
832
832
    def setUp(self):
833
833
        super(TestUpdateEntry, self).setUp()
834
 
        self.addAttrCleanup(dirstate, 'update_entry')
835
 
        dirstate.update_entry = self.update_entry
 
834
        self.overrideAttr(dirstate, 'update_entry', self.update_entry)
836
835
 
837
836
    def get_state_with_a(self):
838
837
        """Create a DirState tracking a single object named 'a'"""
1275
1274
 
1276
1275
    def setUp(self):
1277
1276
        super(TestProcessEntry, self).setUp()
1278
 
        self.addAttrCleanup(dirstate, '_process_entry')
1279
 
        dirstate._process_entry = self._process_entry
 
1277
        self.overrideAttr(dirstate, '_process_entry', self._process_entry)
1280
1278
 
1281
1279
    def assertChangedFileIds(self, expected, tree):
1282
1280
        tree.lock_read()
1291
1289
        # This is a direct test of bug #495023, it relies on osutils.is_inside
1292
1290
        # getting called in an inner function. Which makes it a bit brittle,
1293
1291
        # but at least it does reproduce the bug.
1294
 
        def is_inside_raises(*args, **kwargs):
1295
 
            raise RuntimeError('stop this')
1296
1292
        tree = self.make_branch_and_tree('tree')
1297
1293
        self.build_tree(['tree/file', 'tree/dir/', 'tree/dir/sub',
1298
1294
                         'tree/dir2/', 'tree/dir2/sub2'])
1301
1297
        tree.lock_read()
1302
1298
        self.addCleanup(tree.unlock)
1303
1299
        basis_tree = tree.basis_tree()
1304
 
        self.addAttrCleanup(osutils, 'is_inside')
1305
 
        osutils.is_inside = is_inside_raises
 
1300
        def is_inside_raises(*args, **kwargs):
 
1301
            raise RuntimeError('stop this')
 
1302
        self.overrideAttr(osutils, 'is_inside', is_inside_raises)
1306
1303
        self.assertListRaises(RuntimeError, tree.iter_changes, basis_tree)
1307
1304
 
1308
1305
    def test_simple_changes(self):