commit c5c1da19a4718376f35f610b4c6b9c24ca39c26a
author Jenkins <jenkins@review.openstack.org> Tue Oct 18 15:26:25 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Oct 18 15:26:25 2016 +0000
tree 1a6e918ca637afd0b40b419e5e350f55d10416fd
parent 226cdd470679937f767ee0fe02f522d7308a037e
parent b4f9c61e840f25d82ab9387dbaa83f73582ec9e8

Merge "Lower the log level in tests"

tests/base.py

diff --git a/tests/base.py b/tests/base.py
index 38d2817..25ba7f7 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -857,8 +857,17 @@
             self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
         if (os.environ.get('OS_LOG_CAPTURE') == 'True' or
             os.environ.get('OS_LOG_CAPTURE') == '1'):
+            log_level = logging.INFO
+            if os.environ.get('OS_LOG_LEVEL') == 'DEBUG':
+                log_level = logging.DEBUG
+            elif os.environ.get('OS_LOG_LEVEL') == 'WARNING':
+                log_level = logging.WARNING
+            elif os.environ.get('OS_LOG_LEVEL') == 'ERROR':
+                log_level = logging.ERROR
+            elif os.environ.get('OS_LOG_LEVEL') == 'CRITICAL':
+                log_level = logging.CRITICAL
             self.useFixture(fixtures.FakeLogger(
-                level=logging.DEBUG,
+                level=log_level,
                 format='%(asctime)s %(name)-32s '
                 '%(levelname)-8s %(message)s'))