Fix unit tests breaking from new httpretty version (#903)

httpretty now logs all requests by default which gets mixed up with our
logging tests. Also we were incorrectly setting a logging level to
'None', which now also causes issues with the new httpretty version.
See https://github.com/gabrielfalcao/HTTPretty/pull/419

2 files changed, 8 insertions, 1 deletions

diff --git a/cloudinit/tests/helpers.py b/cloudinit/tests/helpers.py
index 58f63b69..ccd56793 100644
--- a/cloudinit/tests/helpers.py
+++ b/cloudinit/tests/helpers.py
@@ -171,7 +171,7 @@ class CiTestCase(TestCase):
         if self.with_logs:
             # Remove the handler we setup
             logging.getLogger().handlers = self.old_handlers
-            logging.getLogger().level = None
+            logging.getLogger().setLevel(logging.NOTSET)
         subp.subp = _real_subp
         super(CiTestCase, self).tearDown()
 
@@ -360,6 +360,9 @@ class HttprettyTestCase(CiTestCase):
         httpretty.HTTPretty.allow_net_connect = False
         httpretty.reset()
         httpretty.enable()
+        # Stop the logging from HttpPretty so our logs don't get mixed
+        # up with its logs
+        logging.getLogger('httpretty.core').setLevel(logging.CRITICAL)
 
     def tearDown(self):
         httpretty.disable()
diff --git a/cloudinit/tests/test_url_helper.py b/cloudinit/tests/test_url_helper.py
index 364ec822..c3918f80 100644
--- a/cloudinit/tests/test_url_helper.py
+++ b/cloudinit/tests/test_url_helper.py
@@ -8,6 +8,7 @@ from cloudinit import util
 from cloudinit import version
 
 import httpretty
+import logging
 import requests
 
 
@@ -81,6 +82,9 @@ class TestReadFileOrUrl(CiTestCase):
         url = 'http://hostname/path'
         headers = {'sensitive': 'sekret', 'server': 'blah'}
         httpretty.register_uri(httpretty.GET, url)
+        # By default, httpretty will log our request along with the header,
+        # so if we don't change this the secret will show up in the logs
+        logging.getLogger('httpretty.core').setLevel(logging.CRITICAL)
 
         read_file_or_url(url, headers=headers, headers_redact=['sensitive'])
         logs = self.logs.getvalue()