← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockable_files.py

  • Committer: Robert Collins
  • Date: 2009-08-04 04:36:34 UTC
  • mfrom: (4583 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090804043634-2iu9wpcgs273i97s
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockable_files.py
157
157
        l2 = self.get_lockable()
158
158
        orig_factory = bzrlib.ui.ui_factory
159
159
        # silent ui - no need for stdout
160
 
        bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
161
 
        bzrlib.ui.ui_factory.stdin = StringIO("y\n")
 
160
        bzrlib.ui.ui_factory = bzrlib.ui.CannedInputUIFactory([True])
162
161
        try:
163
162
            l2.break_lock()
164
163
        finally: