← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ui.py

  • Committer: Vincent Ladeuil
  • Date: 2007-04-12 14:28:00 UTC
  • mto: (2420.1.1 bzr.http.auth)
  • mto: This revision was merged to the branch mainline in revision 2463.
  • Revision ID: v.ladeuil+lp@free.fr-20070412142800-6e1pc8aksxlp7pg4
Fix tests around stdin emptyness.

* bzrlib/tests/test_ui.py:
Use readline not getline and test '' not None.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ui.py
44
44
                         self.apply_redirected(None, stdout, stdout,
45
45
                                               ui.get_password))
46
46
        self.assertEqual('', stdout.getvalue())
47
 
        # stdin should be empty
48
 
        self.assertEqual(None, ui.stdin.getline())
49
47
        self.assertEqual(None,
50
48
                         self.apply_redirected(None, stdout, stdout,
51
49
                                               ui.get_password,
52
50
                                               u'Hello\u1234 %(user)s',
53
51
                                               user=u'some\u1234'))
54
52
        self.assertEqual('', stdout.getvalue())
55
 
        # stdin should be empty
56
 
        self.assertEqual(None, ui.stdin.getline())
57
53
 
58
54
    def test_text_factory_ascii_password(self):
59
55
        ui = TestUIFactory(stdin='secret\n', stdout=StringIOWrapper())
66
62
            # ': ' is appended to prompt
67
63
            self.assertEqual(': ', ui.stdout.getvalue())
68
64
            # stdin should be empty
69
 
            self.assertEqual(None, ui.stdin.getline())
 
65
            self.assertEqual('', ui.stdin.readline())
70
66
        finally:
71
67
            pb.finished()
72
68
 
91
87
            self.assertEqual(u'Hello \u1234 some\u1234: ',
92
88
                             ui.stdout.getvalue().decode('utf8'))
93
89
            # stdin should be empty
94
 
            self.assertEqual(None, ui.stdin.getline())
 
90
            self.assertEqual('', ui.stdin.readline())
95
91
        finally:
96
92
            pb.finished()
97
93
 
191
187
        self.assertEqual(False, factory.get_boolean(""))
192
188
        self.assertEqual("foo\n", factory.stdin.read())
193
189
        # stdin should be empty
194
 
        self.assertEqual(None, factory.stdin.getline())
 
190
        self.assertEqual('', factory.stdin.readline())
195
191
 
196
192
    def test_silent_ui_getbool(self):
197
193
        factory = bzrlib.ui.SilentUIFactory()
206
202
                                               factory.get_boolean, "foo"))
207
203
        self.assertEqual("", stdout.getvalue())
208
204
        # stdin should be empty
209
 
        self.assertEqual(None, factory.stdin.getline())
 
205
        self.assertEqual('', factory.stdin.readline())
210
206
 
211
207
    def test_text_ui_getbool(self):
212
208
        factory = bzrlib.ui.text.TextUIFactory()
232
228
                         "what do you want? [y/n]: what do you want? [y/n]: ",
233
229
                         factory.stdout.getvalue())
234
230
        # stdin should be empty
235
 
        self.assertEqual(None, factory.stdin.getline())
 
231
        self.assertEqual('', factory.stdin.readline())
236
232