commit edaa084a45a0438b85f3f963a7a50bfed1644bad
author Jenkins <jenkins@review.openstack.org> Fri Aug 30 14:55:21 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Aug 30 14:55:21 2013 +0000
tree 5fdd6cae5452efb765f0123f3289f93d8eb09a00
parent 7457255d0534e7b796e2ded34ab33e5a540ae489
parent 3138807dc37453cb2895a258851deda09fcf886a

Merge "per test_method logging"

tempest/test.py

diff --git a/tempest/test.py b/tempest/test.py
index 8b3cfa6..ccb985a 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -168,6 +168,11 @@
                 os.environ.get('OS_STDERR_CAPTURE') == '1'):
             stderr = self.useFixture(fixtures.StringStream('stderr')).stream
             self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
+        if (os.environ.get('OS_LOG_CAPTURE') != 'False' and
+            os.environ.get('OS_LOG_CAPTURE') != '0'):
+            log_format = '%(asctime)-15s %(message)s'
+            self.useFixture(fixtures.LoggerFixture(nuke_handlers=False,
+                                                   format=log_format))
 
     @classmethod
     def _get_identity_admin_client(cls):