Merge lp:~coreygoldberg/selenium-simple-test/testresult-verbosity into lp:selenium-simple-test

[Corey Goldberg]

added an additional verbosity level to TextTestResult

added an additional verbosity level to TextTestResult, allowing finer grained control of output.

this is used to enable/disable timings in output.

[Vincent Ladeuil (vila)]

I think we've addressed the original issue now.

Unmerged revisions

420. By Corey Goldberg on 2013-06-19

added additional verbosity level to texttestresult

=== modified file 'src/sst/result.py'
--- src/sst/result.py	2013-06-05 13:15:29 +0000
+++ src/sst/result.py	2013-06-19 14:09:29 +0000
@@ -19,19 +19,25 @@
 
 import timeit
 
-
 from testtools import testresult
 
 
 class TextTestResult(testresult.TextTestResult):
-    """A TestResult which outputs activity to a text stream."""
-
+    """A TestResult which outputs activity to a text stream.
+
+    verbosity levels:
+      1: minimal output
+      2: regular output
+      3: regular output with timings
+
+    """
     def __init__(self, stream, failfast=False, verbosity=1, timer=None):
         super(TextTestResult, self).__init__(stream, failfast)
         if timer is None:
             timer = timeit.default_timer
         self.timer = timer
         self.verbose = verbosity > 1
+        self.verbose_timings = verbosity > 2
 
     def startTest(self, test):
         if self.verbose:
@@ -41,9 +47,11 @@
         super(TextTestResult, self).startTest(test)
 
     def stopTest(self, test):
-        if self.verbose:
+        if self.verbose_timings:
             elapsed_time = self.timer() - self.start_time
-            self.stream.write(' (%.3f secs)\n' % elapsed_time)
+            self.stream.write(' (%.3f secs)' % elapsed_time)
+        if self.verbose:
+            self.stream.write('\n')
             self.stream.flush()
         super(TextTestResult, self).stopTest(test)
 
 
=== modified file 'src/sst/runtests.py'
--- src/sst/runtests.py	2013-06-05 13:15:29 +0000
+++ src/sst/runtests.py	2013-06-19 14:09:29 +0000
@@ -22,9 +22,9 @@
 import os
 import sys
 
-
 import testtools
 import testtools.content
+
 from sst import (
     browsers,
     cases,
@@ -91,7 +91,7 @@
             out.write(t.id() + '\n')
         return 0
 
-    text_result = result.TextTestResult(out, failfast=failfast, verbosity=2)
+    text_result = result.TextTestResult(out, failfast=failfast, verbosity=3)
     if report_format == 'xml':
         results_file = os.path.join(results_directory, 'results.xml')
         xml_stream = file(results_file, 'wb')
 
=== modified file 'src/sst/tests/test_result.py'
--- src/sst/tests/test_result.py	2013-06-18 15:51:48 +0000
+++ src/sst/tests/test_result.py	2013-06-19 14:09:29 +0000
@@ -109,7 +109,29 @@
         # simplifies matching the expected result
         test = get_case(kind)
         out = StringIO()
-        res = result.TextTestResult(out, verbosity=2, timer=lambda: 0.0)
+        res = result.TextTestResult(out, verbosity=2)
+        test.run(res)
+        self.assertEquals(expected, res.stream.getvalue())
+
+    def test_pass_output(self):
+        self.assertOutput('''\
+test_pass (sst.tests.test_result.Test) ... OK
+''',
+                          'pass')
+
+
+class TestVerboseTimingConsoleOutput(testtools.TestCase):
+
+    def setUp(self):
+        super(TestVerboseTimingConsoleOutput, self).setUp()
+        tests.set_cwd_to_tmp(self)
+
+    def assertOutput(self, expected, kind):
+        # We don't care about timing here so we always return 0 which
+        # simplifies matching the expected result
+        test = get_case(kind)
+        out = StringIO()
+        res = result.TextTestResult(out, verbosity=3, timer=lambda: 0.0)
         test.run(res)
         self.assertEquals(expected, res.stream.getvalue())