From 5b3abfa5dd3934f4f14f9f5f2bc8fbf852cf2fda Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 12 Aug 2014 16:28:32 +0200
Subject: [PATCH] tests: Disable logging properly.

---
 qutebrowser/test/keyinput/test_basekeyparser.py       |  8 +++++++-
 .../test/utils/http/test_content_disposition.py       | 11 ++++++++---
 qutebrowser/test/utils/test_editor.py                 | 10 ++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/test/keyinput/test_basekeyparser.py b/qutebrowser/test/keyinput/test_basekeyparser.py
index 10081799b..cc5f430dc 100644
--- a/qutebrowser/test/keyinput/test_basekeyparser.py
+++ b/qutebrowser/test/keyinput/test_basekeyparser.py
@@ -21,6 +21,7 @@
 
 """Tests for BaseKeyParser."""
 
+import logging
 import unittest
 from unittest.mock import Mock, patch
 
@@ -42,7 +43,12 @@ CONFIG = {'test': {'<Ctrl-a>': 'ctrla',
 def setUpModule():
     """Mock out some imports in basekeyparser."""
     basekeyparser.QObject = Mock()
-    basekeyparser.logger = Mock()
+    logging.disable(logging.WARNING)
+
+
+def tearDownModule():
+    """Restore mocked out stuff."""
+    logging.disable(logging.NOTSET)
 
 
 class SplitCountTests(unittest.TestCase):
diff --git a/qutebrowser/test/utils/http/test_content_disposition.py b/qutebrowser/test/utils/http/test_content_disposition.py
index f49dac9c2..0652360b2 100644
--- a/qutebrowser/test/utils/http/test_content_disposition.py
+++ b/qutebrowser/test/utils/http/test_content_disposition.py
@@ -21,7 +21,7 @@
 
 import os
 import unittest
-from unittest.mock import Mock
+import logging
 
 import qutebrowser.utils.http as httputils
 from qutebrowser.test.stubs import FakeNetworkReply
@@ -894,8 +894,13 @@ class OurTests(AttachmentTestCase):
 
 
 def setUpModule():
-    """Mock out logging in httputils."""
-    httputils.logger = Mock()
+    """Disable logging."""
+    logging.disable(logging.WARNING)
+
+
+def tearDownModule():
+    """Restore logging."""
+    logging.disable(logging.NOTSET)
 
 
 if __name__ == '__main__':
diff --git a/qutebrowser/test/utils/test_editor.py b/qutebrowser/test/utils/test_editor.py
index 48bb7f970..9f3cedb84 100644
--- a/qutebrowser/test/utils/test_editor.py
+++ b/qutebrowser/test/utils/test_editor.py
@@ -22,6 +22,7 @@
 import os
 import os.path
 import unittest
+import logging
 from unittest.mock import Mock
 
 from PyQt5.QtCore import QProcess
@@ -31,12 +32,17 @@ from qutebrowser.test.stubs import ConfigStub, FakeQProcess
 
 
 def setUpModule():
-    """Mock some things imported in the editor module."""
+    """Disable logging and mock out some imports."""
+    logging.disable(logging.INFO)
     editorutils.message = Mock()
-    editorutils.logger = Mock()
     editorutils.QProcess = FakeQProcess
 
 
+def tearDownModule():
+    """Restore logging."""
+    logging.disable(logging.NOTSET)
+
+
 class ArgTests(unittest.TestCase):
 
     """Test argument handling.