← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_versionedfile.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_versionedfile.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2009 Canonical Ltd
2
2
#
3
3
# Authors:
4
4
#   Johan Rydberg <jrydberg@gnu.org>
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.ProgressTask):
 
737
        class InstrumentedProgress(progress.DummyProgress):
738
738
 
739
739
            def __init__(self):
740
 
                progress.ProgressTask.__init__(self)
 
740
 
 
741
                progress.DummyProgress.__init__(self)
741
742
                self.updates = []
742
743
 
743
744
            def update(self, msg=None, current=None, total=None):
2547
2548
        # the ordering here is to make a tree so that dumb searches have
2548
2549
        # more changes to muck up.
2549
2550
 
2550
 
        class InstrumentedProgress(progress.ProgressTask):
 
2551
        class InstrumentedProgress(progress.DummyProgress):
2551
2552
 
2552
2553
            def __init__(self):
2553
 
                progress.ProgressTask.__init__(self)
 
2554
 
 
2555
                progress.DummyProgress.__init__(self)
2554
2556
                self.updates = []
2555
2557
 
2556
2558
            def update(self, msg=None, current=None, total=None):