Merge branch 'convert-debug-signal-tests'

qutebrowser/test/utils/debug/test_signal.py

@@ -0,0 +1,52 @@
+# 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/>.
+
+"""Test signal debug output functions."""
+
+import pytest
+
+from qutebrowser.test import stubs
+from qutebrowser.utils import debug
+
+
+@pytest.fixture
+def signal():
+    return stubs.FakeSignal()
+
+
+def test_signal_name(signal):
+    """Test signal_name()."""
+    assert debug.signal_name(signal) == 'fake'
+
+
+def test_dbg_signal(signal):
+    """Test dbg_signal()."""
+    assert debug.dbg_signal(signal, [23, 42]) == 'fake(23, 42)'
+
+
+def test_dbg_signal_eliding(signal):
+    """Test eliding in dbg_signal()."""
+    dbg_signal = debug.dbg_signal(signal, ['x' * 201])
+    assert dbg_signal == "fake('{}\u2026)".format('x' * 198)
+
+
+def test_dbg_signal_newline(signal):
+    """Test dbg_signal() with a newline."""
+    dbg_signal = debug.dbg_signal(signal, ['foo\nbar'])
+    assert dbg_signal == r"fake('foo\nbar')"

qutebrowser/test/utils/test_debug.py

@@ -1,60 +0,0 @@
-# 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."""
-
-import re
-import time
-import unittest
-import logging
-
-from qutebrowser.utils import debug
-from qutebrowser.test import stubs
-
-
-class TestDebug(unittest.TestCase):
-
-    """Test signal debug output functions."""
-
-    def setUp(self):
-        self.signal = stubs.FakeSignal()
-
-    def test_signal_name(self):
-        """Test signal_name()."""
-        self.assertEqual(debug.signal_name(self.signal), 'fake')
-
-    def test_dbg_signal(self):
-        """Test dbg_signal()."""
-        self.assertEqual(debug.dbg_signal(self.signal, [23, 42]),
-                         'fake(23, 42)')
-
-    def test_dbg_signal_eliding(self):
-        """Test eliding in dbg_signal()."""
-        self.assertEqual(debug.dbg_signal(self.signal,
-                                          ['x' * 201]),
-                         "fake('{}\u2026)".format('x' * 198))
-
-    def test_dbg_signal_newline(self):
-        """Test dbg_signal() with a newline."""
-        self.assertEqual(debug.dbg_signal(self.signal, ['foo\nbar']),
-                         r"fake('foo\nbar')")
-
-
-if __name__ == '__main__':
-    unittest.main()