Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-06 08:39:17 +01:00
Code Issues Projects Releases Wiki Activity

Removed unicode_literals from test_logging

Browse source
This commit is contained in:
Peter Kessen 2016-02-23 18:27:30 +01:00
parent 7135fac17b
commit 955eae46c6
1 changed files with 43 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
test/test_logging.py
View file

@ -1,8 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Stupid tests that ensure logging works as expected""" """Stupid tests that ensure logging works as expected"""
from __future__ import (division, absolute_import, print_function, from __future__ import (division, absolute_import, print_function)
unicode_literals)
import sys import sys
import threading import threading
@ -45,9 +44,9 @@ class LoggingTest(TestCase):
l.addHandler(handler) l.addHandler(handler)
l.propagate = False l.propagate = False
l.warning("foo {0} {bar}", "oof", bar="baz") l.warning(u"foo {0} {bar}", "oof", bar=u"baz")
handler.flush() handler.flush()
self.assertTrue(stream.getvalue(), "foo oof baz") self.assertTrue(stream.getvalue(), u"foo oof baz")
class LoggingLevelTest(unittest.TestCase, helper.TestHelper): class LoggingLevelTest(unittest.TestCase, helper.TestHelper):
@ -59,9 +58,9 @@ class LoggingLevelTest(unittest.TestCase, helper.TestHelper):
self.register_listener('dummy_event', self.listener) self.register_listener('dummy_event', self.listener)
def log_all(self, name): def log_all(self, name):
self._log.debug('debug ' + name) self._log.debug(u'debug ' + name)
self._log.info('info ' + name) self._log.info(u'info ' + name)
self._log.warning('warning ' + name) self._log.warning(u'warning ' + name)
def commands(self): def commands(self):
cmd = ui.Subcommand('dummy') cmd = ui.Subcommand('dummy')
@ -92,76 +91,76 @@ class LoggingLevelTest(unittest.TestCase, helper.TestHelper):
self.config['verbose'] = 0 self.config['verbose'] = 0
with helper.capture_log() as logs: with helper.capture_log() as logs:
self.run_command('dummy') self.run_command('dummy')
self.assertIn('dummy: warning cmd', logs) self.assertIn(u'dummy: warning cmd', logs)
self.assertIn('dummy: info cmd', logs) self.assertIn(u'dummy: info cmd', logs)
self.assertNotIn('dummy: debug cmd', logs) self.assertNotIn(u'dummy: debug cmd', logs)
def test_command_level1(self): def test_command_level1(self):
self.config['verbose'] = 1 self.config['verbose'] = 1
with helper.capture_log() as logs: with helper.capture_log() as logs:
self.run_command('dummy') self.run_command('dummy')
self.assertIn('dummy: warning cmd', logs) self.assertIn(u'dummy: warning cmd', logs)
self.assertIn('dummy: info cmd', logs) self.assertIn(u'dummy: info cmd', logs)
self.assertIn('dummy: debug cmd', logs) self.assertIn(u'dummy: debug cmd', logs)
def test_command_level2(self): def test_command_level2(self):
self.config['verbose'] = 2 self.config['verbose'] = 2
with helper.capture_log() as logs: with helper.capture_log() as logs:
self.run_command('dummy') self.run_command('dummy')
self.assertIn('dummy: warning cmd', logs) self.assertIn(u'dummy: warning cmd', logs)
self.assertIn('dummy: info cmd', logs) self.assertIn(u'dummy: info cmd', logs)
self.assertIn('dummy: debug cmd', logs) self.assertIn(u'dummy: debug cmd', logs)
def test_listener_level0(self): def test_listener_level0(self):
self.config['verbose'] = 0 self.config['verbose'] = 0
with helper.capture_log() as logs: with helper.capture_log() as logs:
plugins.send('dummy_event') plugins.send('dummy_event')
self.assertIn('dummy: warning listener', logs) self.assertIn(u'dummy: warning listener', logs)
self.assertNotIn('dummy: info listener', logs) self.assertNotIn(u'dummy: info listener', logs)
self.assertNotIn('dummy: debug listener', logs) self.assertNotIn(u'dummy: debug listener', logs)
def test_listener_level1(self): def test_listener_level1(self):
self.config['verbose'] = 1 self.config['verbose'] = 1
with helper.capture_log() as logs: with helper.capture_log() as logs:
plugins.send('dummy_event') plugins.send('dummy_event')
self.assertIn('dummy: warning listener', logs) self.assertIn(u'dummy: warning listener', logs)
self.assertIn('dummy: info listener', logs) self.assertIn(u'dummy: info listener', logs)
self.assertNotIn('dummy: debug listener', logs) self.assertNotIn(u'dummy: debug listener', logs)
def test_listener_level2(self): def test_listener_level2(self):
self.config['verbose'] = 2 self.config['verbose'] = 2
with helper.capture_log() as logs: with helper.capture_log() as logs:
plugins.send('dummy_event') plugins.send('dummy_event')
self.assertIn('dummy: warning listener', logs) self.assertIn(u'dummy: warning listener', logs)
self.assertIn('dummy: info listener', logs) self.assertIn(u'dummy: info listener', logs)
self.assertIn('dummy: debug listener', logs) self.assertIn(u'dummy: debug listener', logs)
def test_import_stage_level0(self): def test_import_stage_level0(self):
self.config['verbose'] = 0 self.config['verbose'] = 0
with helper.capture_log() as logs: with helper.capture_log() as logs:
importer = self.create_importer() importer = self.create_importer()
importer.run() importer.run()
self.assertIn('dummy: warning import_stage', logs) self.assertIn(u'dummy: warning import_stage', logs)
self.assertNotIn('dummy: info import_stage', logs) self.assertNotIn(u'dummy: info import_stage', logs)
self.assertNotIn('dummy: debug import_stage', logs) self.assertNotIn(u'dummy: debug import_stage', logs)
def test_import_stage_level1(self): def test_import_stage_level1(self):
self.config['verbose'] = 1 self.config['verbose'] = 1
with helper.capture_log() as logs: with helper.capture_log() as logs:
importer = self.create_importer() importer = self.create_importer()
importer.run() importer.run()
self.assertIn('dummy: warning import_stage', logs) self.assertIn(u'dummy: warning import_stage', logs)
self.assertIn('dummy: info import_stage', logs) self.assertIn(u'dummy: info import_stage', logs)
self.assertNotIn('dummy: debug import_stage', logs) self.assertNotIn(u'dummy: debug import_stage', logs)
def test_import_stage_level2(self): def test_import_stage_level2(self):
self.config['verbose'] = 2 self.config['verbose'] = 2
with helper.capture_log() as logs: with helper.capture_log() as logs:
importer = self.create_importer() importer = self.create_importer()
importer.run() importer.run()
self.assertIn('dummy: warning import_stage', logs) self.assertIn(u'dummy: warning import_stage', logs)
self.assertIn('dummy: info import_stage', logs) self.assertIn(u'dummy: info import_stage', logs)
self.assertIn('dummy: debug import_stage', logs) self.assertIn(u'dummy: debug import_stage', logs)
@_common.slow_test() @_common.slow_test()
@ -182,9 +181,9 @@ class ConcurrentEventsTest(TestCase, helper.TestHelper):
self.t1_step = self.t2_step = 0 self.t1_step = self.t2_step = 0
def log_all(self, name): def log_all(self, name):
self._log.debug('debug ' + name) self._log.debug(u'debug ' + name)
self._log.info('info ' + name) self._log.info(u'info ' + name)
self._log.warning('warning ' + name) self._log.warning(u'warning ' + name)
def listener1(self): def listener1(self):
try: try:
@ -257,14 +256,14 @@ class ConcurrentEventsTest(TestCase, helper.TestHelper):
self.assertFalse(t2.is_alive()) self.assertFalse(t2.is_alive())
except: except:
print("Alive threads:", threading.enumerate()) print(u"Alive threads:", threading.enumerate())
if dp.lock1.locked(): if dp.lock1.locked():
print("Releasing lock1 after exception in test") print(u"Releasing lock1 after exception in test")
dp.lock1.release() dp.lock1.release()
if dp.lock2.locked(): if dp.lock2.locked():
print("Releasing lock2 after exception in test") print(u"Releasing lock2 after exception in test")
dp.lock2.release() dp.lock2.release()
print("Alive threads:", threading.enumerate()) print(u"Alive threads:", threading.enumerate())
raise raise
def test_root_logger_levels(self): def test_root_logger_levels(self):
@ -283,14 +282,14 @@ class ConcurrentEventsTest(TestCase, helper.TestHelper):
importer = self.create_importer() importer = self.create_importer()
importer.run() importer.run()
for l in logs: for l in logs:
self.assertIn("import", l) self.assertIn(u"import", l)
self.assertIn("album", l) self.assertIn(u"album", l)
blog.getLogger('beets').set_global_level(blog.DEBUG) blog.getLogger('beets').set_global_level(blog.DEBUG)
with helper.capture_log() as logs: with helper.capture_log() as logs:
importer = self.create_importer() importer = self.create_importer()
importer.run() importer.run()
self.assertIn("Sending event: database_change", logs) self.assertIn(u"Sending event: database_change", logs)
def suite(): def suite():