Merge branch 'convert-logtime-tests'

qutebrowser/test/utils/debug/test_log_time.py

@@ -0,0 +1,47 @@
+# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for qutebrowser.utils.debug.log_time."""
+
+import logging
+import re
+import time
+
+from qutebrowser.utils import debug
+
+
+def test_log_time(caplog):
+    """Test if log_time logs properly."""
+    logger_name = 'qt-tests'
+
+    with caplog.atLevel(logging.DEBUG, logger=logger_name):
+        with debug.log_time(logging.getLogger(logger_name), action='foobar'):
+            time.sleep(0.1)
+
+        records = caplog.records()
+        assert len(records) == 1
+
+        pattern = re.compile(r'^Foobar took ([\d.]*) seconds\.$')
+        match = pattern.match(records[0].msg)
+        assert match
+
+        duration = float(match.group(1))
+
+        # Imitate unittests assertAlmostEqual(duration, 0.1, delta=0.01)
+        assert round(duration - 0.1, 2) == 0

qutebrowser/test/utils/test_debug.py

@@ -56,22 +56,5 @@ class TestDebug(unittest.TestCase):
                          r"fake('foo\nbar')")
 
 
-class TestLogTime(unittest.TestCase):
-
-    """Test log_time."""
-
-    def test_log_time(self):
-        """Test if log_time logs properly."""
-        logger = logging.getLogger('qt-tests')
-        with self.assertLogs(logger, logging.DEBUG) as logged:
-            with debug.log_time(logger, action='foobar'):
-                time.sleep(0.1)
-            self.assertEqual(len(logged.records), 1)
-            pattern = re.compile(r'^Foobar took ([\d.]*) seconds\.$')
-            match = pattern.match(logged.records[0].msg)
-            self.assertTrue(match)
-            duration = float(match.group(1))
-            self.assertAlmostEqual(duration, 0.1, delta=0.01)
-
 if __name__ == '__main__':
     unittest.main()

tox.ini

@@ -19,6 +19,7 @@ setenv = QT_QPA_PLATFORM_PLUGIN_PATH={envsitepackagesdir}/PyQt5/plugins/platform
 deps =
     py==1.4.26
     pytest==2.7.0
+    pytest-capturelog==0.7
 # We don't use {[testenv:mkvenv]commands} here because that seems to be broken
 # on Ubuntu Trusty.
 commands =