Merge lp:~dobey/ubuntuone-dev-tools/add-coverage into lp:ubuntuone-dev-tools

[dobey]

Add an option to enable coverage reporting for tests

[Eric Casteleijn (thisfred)]

Looks great to me!

review: Approve

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'bin/u1trial'
--- bin/u1trial	2010-11-03 21:04:06 +0000
+++ bin/u1trial	2010-11-22 19:18:53 +0000
@@ -20,6 +20,7 @@
 
 """Test runner that uses a private dbus session and glib main loop."""
 
+import coverage
 import gc
 import inspect
 import os
@@ -57,6 +58,7 @@
                                          workingDirectory=working_dir,
                                          forceGarbageCollection=True)
         self.required_services = []
+        self.source_files = []
 
     def _load_unittest(self, relpath):
         """Load unit tests from a Python module with the given 'relpath'."""
@@ -117,29 +119,35 @@
         # pylint: disable=W0612
         for root, dirs, files in os.walk(path):
             for test in files:
-                path = os.path.join(root, test)
-                if test.endswith(".py") and test.startswith("test_"):
-                    module_suite = self._load_unittest(path)
-                    if pattern:
-                        for inner_suite in module_suite._tests:
-                            for test in inner_suite._tests:
-                                if pattern.match(test.id()):
-                                    suite.addTest(test)
-                    else:
-                        suite.addTests(module_suite)
+                filepath = os.path.join(root, test)
+                if test.endswith(".py"):
+                    self.source_files.append(filepath)
+                    if test.startswith("test_"):
+                        module_suite = self._load_unittest(filepath)
+                        if pattern:
+                            for inner_suite in module_suite._tests:
+                                for test in inner_suite._tests:
+                                    if pattern.match(test.id()):
+                                        suite.addTest(test)
+                        else:
+                            suite.addTests(module_suite)
         return suite
 
     # pylint: disable=E0202
-    def run(self, path, test_pattern=None, loops=None):
-        """run the tests. """
+    def run(self, path, options=None):
+        """run the tests."""
         success = 0
         running_services = []
+        if options.coverage:
+            coverage.erase()
+            coverage.start()
+
         try:
-            suite = self._collect_tests(path, test_pattern)
-            if loops:
+            suite = self._collect_tests(path, options.test)
+            if options.loops:
                 old_suite = suite
                 suite = unittest.TestSuite()
-                for _ in xrange(loops):
+                for _ in xrange(options.loops):
                     suite.addTest(old_suite)
 
             # Start any required services
@@ -155,6 +163,11 @@
             for runner in running_services:
                 runner.stop_service()
 
+        if options.coverage:
+            coverage.stop()
+            coverage.report(self.source_files, ignore_errors=True,
+                            show_missing=False)
+
         if not success:
             sys.exit(1)
         else:
@@ -171,6 +184,8 @@
     parser.add_option("-l", "--loop", dest="loops", type="int", default=1,
                       help = "loop selected tests LOOPS number of times",
                       metavar="LOOPS")
+    parser.add_option("-c", "--coverage", action="store_true", dest="coverage",
+                      help="print a coverage report when finished")
 
     (options, args) = parser.parse_args()
     if args:
@@ -182,7 +197,7 @@
         parser.print_help()
         sys.exit(2)
 
-    TestRunner().run(testpath, options.test, options.loops)
+    TestRunner().run(testpath, options)
 
 if __name__ == '__main__':
     main()

=== modified file 'run-tests'
--- run-tests	2010-11-04 15:00:56 +0000
+++ run-tests	2010-11-22 19:18:53 +0000
@@ -16,7 +16,8 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 set -e
 
-bin/u1trial ubuntuone
-bin/u1lint .
+bin/u1trial -c ubuntuone
+bin/u1lint
 pep8 --repeat .
 rm -rf _trial_temp
+rm -rf .coverage