jenkins-bot submitted this change.

View Change

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
[test] Test flushing ui for T282962

Change-Id: Ie49a67181f8743c185f4f336b05215c1042b80f0
---
M pywikibot/userinterfaces/terminal_interface_base.py
M tests/ui_tests.py
2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py
index 9db7fc3..b51db48 100755
--- a/pywikibot/userinterfaces/terminal_interface_base.py
+++ b/pywikibot/userinterfaces/terminal_interface_base.py
@@ -528,6 +528,7 @@

def flush(self):
"""Flush the stream."""
+ self.UI.flush()
self.stream.flush()

def emit(self, record):
diff --git a/tests/ui_tests.py b/tests/ui_tests.py
index 4f5e610..ce56b14 100644
--- a/tests/ui_tests.py
+++ b/tests/ui_tests.py
@@ -154,36 +154,43 @@

def test_output(self):
pywikibot.output('output')
+ ui.flush()
self.assertEqual(newstdout.getvalue(), '')
self.assertEqual(newstderr.getvalue(), 'output\n')

def test_stdout(self):
pywikibot.stdout('output')
+ ui.flush()
self.assertEqual(newstdout.getvalue(), 'output\n')
self.assertEqual(newstderr.getvalue(), '')

def test_warning(self):
pywikibot.warning('warning')
+ ui.flush()
self.assertEqual(newstdout.getvalue(), '')
self.assertEqual(newstderr.getvalue(), 'WARNING: warning\n')

def test_error(self):
pywikibot.error('error')
+ ui.flush()
self.assertEqual(newstdout.getvalue(), '')
self.assertEqual(newstderr.getvalue(), 'ERROR: error\n')

def test_log(self):
pywikibot.log('log')
+ ui.flush()
self.assertEqual(newstdout.getvalue(), '')
self.assertEqual(newstderr.getvalue(), '')

def test_critical(self):
pywikibot.critical('critical')
+ ui.flush()
self.assertEqual(newstdout.getvalue(), '')
self.assertEqual(newstderr.getvalue(), 'CRITICAL: critical\n')

def test_debug(self):
pywikibot.debug('debug', 'test')
+ ui.flush()
self.assertEqual(newstdout.getvalue(), '')
self.assertEqual(newstderr.getvalue(), '')

@@ -196,6 +203,7 @@
raise TestException('Testing Exception')
except TestException:
pywikibot.exception('exception')
+ ui.flush()
self.assertEqual(newstdout.getvalue(), '')
self.assertEqual(newstderr.getvalue(),
'ERROR: TestException: Testing Exception\n')

To view, visit change 691943. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: tests
Gerrit-Change-Id: Ie49a67181f8743c185f4f336b05215c1042b80f0
Gerrit-Change-Number: 691943
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged