summaryrefslogtreecommitdiffstats
path: root/deluge/tests/test_log.py
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-02-19 15:05:52 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-02-19 16:15:47 +0000
commitb686174b07bd56af4e5ffaa23c24f27f417fc305 (patch)
tree1ce335620d99341d94e88c159c0b9b0f6f0de5a0 /deluge/tests/test_log.py
parentAdding debian version 2.0.3-4. (diff)
downloaddeluge-b686174b07bd56af4e5ffaa23c24f27f417fc305.tar.xz
deluge-b686174b07bd56af4e5ffaa23c24f27f417fc305.zip
Merging upstream version 2.1.1 (Closes: #1026291).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'deluge/tests/test_log.py')
-rw-r--r--deluge/tests/test_log.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/deluge/tests/test_log.py b/deluge/tests/test_log.py
index 572693b..f0dcbee 100644
--- a/deluge/tests/test_log.py
+++ b/deluge/tests/test_log.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#
# Copyright (C) 2015 Calum Lind <calumlind@gmail.com>
# Copyright (C) 2010 Pedro Algarvio <ufs@ufsoft.org>
@@ -8,17 +7,14 @@
# See LICENSE for more details.
#
-from __future__ import unicode_literals
-
import logging
import warnings
+from deluge.conftest import BaseTestCase
from deluge.log import setup_logger
-from .basetest import BaseTestCase
-
-class LogTestCase(BaseTestCase):
+class TestLog(BaseTestCase):
def set_up(self):
setup_logger(logging.DEBUG)
@@ -32,7 +28,7 @@ class LogTestCase(BaseTestCase):
# Cause all warnings to always be triggered.
warnings.simplefilter('always')
LOG.debug('foo')
- self.assertEqual(w[-1].category, DeprecationWarning)
+ assert w[-1].category == DeprecationWarning
# def test_twisted_error_log(self):
# from twisted.internet import defer