Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use non-deprecated assertion methods #98

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use non-deprecated assertion methods #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/test_logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def test_struct_dict(self):
self.log.struct_dict(d)
assert len(self.messages) == 1
m = self.messages.pop()
self.assertDictContainsSubset(d, m.fields)
self.assertLessEqual(d.items(), m.fields.items())
assert m.fields is not d
assert m.text == ""
assert m.level == levels.INFO
Expand All @@ -258,7 +258,8 @@ def test_fields(self):
self.log.struct(x=42)
assert len(self.messages) == 1
m = self.messages.pop()
self.assertDictContainsSubset({'x': 42}, m.fields)
d = {'x': 42}
self.assertLessEqual(d.items(), m.fields.items())
assert m.text == ""
assert m.level == levels.INFO

Expand Down
32 changes: 16 additions & 16 deletions tests/test_logging_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def tearDownModule():
class HijackTest(TestCase):

def compare_modules(self, m1, m2):
self.failUnlessEqual(m1.__name__, m2.__name__)
self.assertEqual(m1.__name__, m2.__name__)

def verify_orig(self):
import logging
Expand Down Expand Up @@ -47,16 +47,16 @@ class TestGetLogger(TestCase):

def test_name(self):
from twiggy.logging_compat import getLogger
self.failUnlessEqual(getLogger("spam")._logger._fields["name"], "spam")
self.assertEqual(getLogger("spam")._logger._fields["name"], "spam")

def test_root(self):
from twiggy.logging_compat import getLogger, root
self.failUnlessEqual(getLogger(), root)
self.assertEqual(getLogger(), root)

def test_cache(self):
from twiggy.logging_compat import getLogger
eggs = getLogger("eggs")
self.failUnless(getLogger("eggs") is eggs)
self.assertIs(getLogger("eggs"), eggs)


class TestFakeLogger(TestCase):
Expand All @@ -75,49 +75,49 @@ def test_level(self):
from twiggy.logging_compat import INFO, ERROR
for level in [INFO, ERROR]:
self.logger.setLevel(level)
self.failUnlessEqual(self.logger.level, level)
self.assertEqual(self.logger.level, level)

def test_percent(self):
self.failUnlessEqual(self.logger._logger._options["style"], "percent")
self.assertEqual(self.logger._logger._options["style"], "percent")

def test_exception(self):
try:
1 / 0
except ZeroDivisionError:
self.logger.exception("spam")
self.failUnless("ZeroDivisionError" in self.messages[0].traceback)
self.assertIn("ZeroDivisionError", self.messages[0].traceback)

def test_isEnabledFor(self):
from twiggy.logging_compat import INFO, DEBUG
self.logger.setLevel(INFO)
self.failIf(self.logger.isEnabledFor(DEBUG))
self.assertFalse(self.logger.isEnabledFor(DEBUG))
self.logger.setLevel(DEBUG)
self.failUnless(self.logger.isEnabledFor(DEBUG))
self.assertTrue(self.logger.isEnabledFor(DEBUG))

def test_log_no_exc_info(self):
self.logger.info("nothing", exc_info=True)
self.failUnlessEqual(self.messages[0].traceback, None)
self.assertEqual(self.messages[0].traceback, None)

def test_log_exc_info(self):
try:
1 / 0
except ZeroDivisionError:
self.logger.error("exception", exc_info=True)
self.failUnless("ZeroDivisionError" in self.messages[0].traceback)
self.assertIn("ZeroDivisionError", self.messages[0].traceback)

def test_basicConfig(self):
from twiggy.logging_compat import basicConfig
self.failUnlessRaises(RuntimeError, basicConfig)
self.assertRaises(RuntimeError, basicConfig)

def test_log(self):
from twiggy.logging_compat import INFO, ERROR
for index, level in enumerate((INFO, ERROR)):
self.logger.log(level, "spam")
self.failUnlessEqual(self.messages[index].text, "spam")
self.failUnlessEqual(self.messages[index].level, level)
self.assertEqual(self.messages[index].text, "spam")
self.assertEqual(self.messages[index].level, level)

def test_log_bad_level(self):
self.failUnlessRaises(ValueError, self.logger.log, "illegal level", "eggs")
self.assertRaises(ValueError, self.logger.log, "illegal level", "eggs")


class TestLoggingBridge(TestCase):
Expand All @@ -132,7 +132,7 @@ def test_format(self):
messages = list_output.messages
add_emitters(("spam", DEBUG, None, list_output))
logger.error("eggs")
self.failUnlessEqual(messages[0], ('|eggs\n', ERROR, 'spam'))
self.assertEqual(messages[0], ('|eggs\n', ERROR, 'spam'))

def test_sanity(self):
from twiggy import add_emitters, log
Expand Down