← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockdir.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-24 18:26:21 UTC
  • mfrom: (4567 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4568.
  • Revision ID: john@arbash-meinel.com-20090724182621-68s2jhoqf3pn72n7
Merge bzr.dev 4567 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockdir.py
561
561
        # do this without IO redirection to ensure it doesn't prompt.
562
562
        self.assertRaises(AssertionError, ld1.break_lock)
563
563
        orig_factory = bzrlib.ui.ui_factory
564
 
        # silent ui - no need for stdout
565
 
        bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
566
 
        bzrlib.ui.ui_factory.stdin = StringIO("y\n")
 
564
        bzrlib.ui.ui_factory = bzrlib.ui.CannedInputUIFactory([True])
567
565
        try:
568
566
            ld2.break_lock()
569
567
            self.assertRaises(LockBroken, ld1.unlock)