being schizophrenic about coverage combining/not-combining

holland-backup · May 20, 2011 · c54f9d7 · c54f9d7
1 parent add692a
commit c54f9d7
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/scripts/test_runner.py b/scripts/test_runner.py
@@ -105,16 +105,16 @@ def _run_tests(self, paths):
                 logging.warning(" * Test exited with failure status %d", ret)
 
             if self.report:
-                os.rename(os.path.join(path, '.coverage'),
-                          os.path.join(SRC_ROOT, '.coverage.' +
-                              os.path.basename(path)))
+                #os.rename(os.path.join(path, '.coverage'),
+                #          os.path.join(SRC_ROOT, '.coverage.' +
+                #              os.path.basename(path)))
 
-        exec_command([self.coverage, 'combine'])
-        exec_command([self.coverage, 'xml',
-                     '--include', 'holland/*,plugins/*',
+                exec_command([self.coverage, 'xml',
+                     '--include', 'holland/*',
                      '--omit',
                      'tests,holland/cli/backports,/usr/'],
                      close_fds=True)
+
         return True
 
     def _run_pylint(self, paths):