~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_versionedfile.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
734
734
        # the ordering here is to make a tree so that dumb searches have
735
735
        # more changes to muck up.
736
736
 
737
 
        class InstrumentedProgress(progress.DummyProgress):
 
737
        class InstrumentedProgress(progress.ProgressTask):
738
738
 
739
739
            def __init__(self):
740
 
 
741
 
                progress.DummyProgress.__init__(self)
 
740
                progress.ProgressTask.__init__(self)
742
741
                self.updates = []
743
742
 
744
743
            def update(self, msg=None, current=None, total=None):
1470
1469
            transport.mkdir('.')
1471
1470
        files = self.factory(transport)
1472
1471
        if self.cleanup is not None:
1473
 
            self.addCleanup(lambda:self.cleanup(files))
 
1472
            self.addCleanup(self.cleanup, files)
1474
1473
        return files
1475
1474
 
1476
1475
    def get_simple_key(self, suffix):
2548
2547
        # the ordering here is to make a tree so that dumb searches have
2549
2548
        # more changes to muck up.
2550
2549
 
2551
 
        class InstrumentedProgress(progress.DummyProgress):
 
2550
        class InstrumentedProgress(progress.ProgressTask):
2552
2551
 
2553
2552
            def __init__(self):
2554
 
 
2555
 
                progress.DummyProgress.__init__(self)
 
2553
                progress.ProgressTask.__init__(self)
2556
2554
                self.updates = []
2557
2555
 
2558
2556
            def update(self, msg=None, current=None, total=None):