Merge lp:~mrazik/pyruntest/lp1154032 into lp:pyruntest

[Martin Mrazik]

This is introducing a new option for formatted output (-fo) so logging output is not in the xml.

This is introducing a new option for formatted output (-fo) so logging output is not in the xml.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/pyruntest-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pyruntest-raring-amd64-ci/1//console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pyruntest-raring-armhf-ci/1//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/pyruntest-ci/1//rebuild/?

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'pyruntest'
--- pyruntest	2012-09-14 02:23:55 +0000
+++ pyruntest	2013-03-12 13:06:11 +0000
@@ -22,13 +22,16 @@
 
 
 logger = logging.getLogger(__name__)
-_output_stream = None
+_output_descriptors = {
+    '_output_stream':  None,
+    '_formatted_output_stream': None
+}
 
 
 def main():
     args = parse_args()
 
-    logging.basicConfig(stream=get_output_stream(args))
+    logging.basicConfig(stream=get_output_stream(args.output, '_output_stream'))
     test_suite = load_test_suite_from_name(args.suite)
     runner = construct_test_runner(args)
     success = runner.run(test_suite).wasSuccessful()
@@ -36,15 +39,15 @@
         exit(1)
 
 
-def get_output_stream(args):
-    global _output_stream
+def get_output_stream(output, name):
+    global _output_descriptors
 
-    if _output_stream is None:
-        if args.output:
-            _output_stream = open(args.output, 'w')
+    if _output_descriptors[name] is None:
+        if output:
+            _output_descriptors[name] = open(output, 'w')
         else:
-            _output_stream = sys.stdout
-    return _output_stream
+            _output_descriptors[name] = sys.stdout
+    return _output_descriptors[name]
 
 
 def patch_python_path():
@@ -110,7 +113,7 @@
 
 
 def construct_test_runner(args):
-    output_stream = get_output_stream(args)
+    output_stream = get_output_stream(args.formatted_output, '_formatted_output_stream')
 
     kwargs = dict(stdout=output_stream,
         output_format=args.format
@@ -200,6 +203,9 @@
     parser.add_argument('-f', '--format', choices=supported_formats.keys(),
         action=FormatAction, default=supported_formats['text'],
         help="""Specify what format the test results should be presented in.""")
+    parser.add_argument('-fo', '--formatted-output', type=str,
+        help="""Specify where formatted output (e.g. xml) should go. If left
+        unspecified, stdout is used.""")
     parser.add_argument('-o', '--output', help="""Specify the location where test
         output should go. If left unspecified, stdout is used.""")
     if have_coverage():
 
=== modified file 'tests.py'
--- tests.py	2012-09-14 02:23:55 +0000
+++ tests.py	2013-03-12 13:06:11 +0000
@@ -36,6 +36,21 @@
             '''))
         self.addCleanup(remove, 'test_empty.py')
 
+    def create_test_file_with_logging(self):
+        open('test_logging.py', 'w').write(dedent('''\
+
+            from testtools import TestCase
+            import logging
+
+            class SimpleTests(TestCase):
+
+                def test_simple(self):
+                    logging.error("logging.error")
+                    self.assertEqual(1,1)
+
+            '''))
+        self.addCleanup(remove, 'test_logging.py')
+
     def create_test_package(self):
         location = mkdtemp()
         self.addCleanup(rmtree, location)
@@ -87,7 +102,7 @@
 
     def test_output_can_be_saved_to_file(self):
         self.create_empty_test_file()
-        out, err, code = self.run_script('-o', 'test_output', 'test_empty')
+        out, err, code = self.run_script('-fo', 'test_output', 'test_empty')
         self.addCleanup(remove, 'test_output')
 
         self.assertThat(code, Equals(0))
@@ -97,7 +112,7 @@
 
     def test_output_can_be_saved_to_xml_file(self):
         self.create_empty_test_file()
-        out, err, code = self.run_script('-o', 'test_output', '-f', 'xml', 'test_empty')
+        out, err, code = self.run_script('-fo', 'test_output', '-f', 'xml', 'test_empty')
         self.addCleanup(remove, 'test_output')
 
         self.assertThat(code, Equals(0))
@@ -105,6 +120,19 @@
         self.assertThat(err, Equals(''))
         self.assertThat(open('test_output').read(), Contains('<testcase classname="test_empty.SimpleTests" name="test_simple"'))
 
+    def test_no_logging_in_xml_file(self):
+        self.create_test_file_with_logging()
+        out, err, code = self.run_script('-fo', 'test_output', '-f', 'xml',
+            'test_logging')
+        self.addCleanup(remove, 'test_output')
+
+        self.assertThat(code, Equals(0))
+        self.assertThat(out, Contains('logging.error'))
+        self.assertThat(err, Equals(''))
+        self.assertThat(open('test_output').read(), Contains('<testcase classname="test_logging.SimpleTests" name="test_simple"'))
+        self.assertThat(open('test_output').read(), Not(Contains('logging.error')))
+
+
     def test_generates_text_coverage_by_default(self):
         self.create_empty_test_file()
         out, err, code = self.run_script('-c', 'test_empty')