jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666927 )
Change subject: [tests] simplify TestTerminalOutput tests
......................................................................
[tests] simplify TestTerminalOutput tests
Change-Id: I908ac09a3e71da495047368c0bf4fc9ac7c0ef20
---
M tests/ui_tests.py
1 file changed, 18 insertions(+), 38 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/ui_tests.py b/tests/ui_tests.py
index c70737f..2d39155 100644
--- a/tests/ui_tests.py
+++ b/tests/ui_tests.py
@@ -211,45 +211,25 @@
"""Terminal output tests."""
- def testOutputLevels_logging_debug(self):
- logger.log(DEBUG, 'debug', extra=loggingcontext)
- self.assertEqual(newstdout.getvalue(), '')
- self.assertEqual(newstderr.getvalue(), '')
+ tests = [
+ ('debug', DEBUG, '', ''),
+ ('verbose', VERBOSE, '', ''),
+ ('info', INFO, '', 'info\n'),
+ ('stdout', STDOUT, 'stdout\n', ''),
+ ('input', INPUT, '', 'input\n'),
+ ('WARNING', WARNING, '', 'WARNING: WARNING\n'),
+ ('ERROR', ERROR, '', 'ERROR: ERROR\n'),
+ ('CRITICAL', CRITICAL, '', 'CRITICAL: CRITICAL\n'),
+ ]
- def testOutputLevels_logging_verbose(self):
- logger.log(VERBOSE, 'verbose', extra=loggingcontext)
- self.assertEqual(newstdout.getvalue(), '')
- self.assertEqual(newstderr.getvalue(), '')
-
- def testOutputLevels_logging_info(self):
- logger.log(INFO, 'info', extra=loggingcontext)
- self.assertEqual(newstdout.getvalue(), '')
- self.assertEqual(newstderr.getvalue(), 'info\n')
-
- def testOutputLevels_logging_stdout(self):
- logger.log(STDOUT, 'stdout', extra=loggingcontext)
- self.assertEqual(newstdout.getvalue(), 'stdout\n')
- self.assertEqual(newstderr.getvalue(), '')
-
- def testOutputLevels_logging_input(self):
- logger.log(INPUT, 'input', extra=loggingcontext)
- self.assertEqual(newstdout.getvalue(), '')
- self.assertEqual(newstderr.getvalue(), 'input\n')
-
- def testOutputLevels_logging_WARNING(self):
- logger.log(WARNING, 'WARNING', extra=loggingcontext)
- self.assertEqual(newstdout.getvalue(), '')
- self.assertEqual(newstderr.getvalue(), 'WARNING: WARNING\n')
-
- def testOutputLevels_logging_ERROR(self):
- logger.log(ERROR, 'ERROR', extra=loggingcontext)
- self.assertEqual(newstdout.getvalue(), '')
- self.assertEqual(newstderr.getvalue(), 'ERROR: ERROR\n')
-
- def testOutputLevels_logging_CRITICAL(self):
- logger.log(CRITICAL, 'CRITICAL', extra=loggingcontext)
- self.assertEqual(newstdout.getvalue(), '')
- self.assertEqual(newstderr.getvalue(), 'CRITICAL: CRITICAL\n')
+ def test_outputlevels_logging(self):
+ """Test logger with output levels."""
+ for text, level, out, err in self.tests:
+ with self.subTest(test=text):
+ logger.log(level, text, extra=loggingcontext)
+ self.assertEqual(newstdout.getvalue(), out)
+ self.assertEqual(newstderr.getvalue(), err)
+ patch() # reset terminal files
def test_output(self):
pywikibot.output('output')
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666927
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I908ac09a3e71da495047368c0bf4fc9ac7c0ef20
Gerrit-Change-Number: 666927
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
