Merge pull request codecov#134 from alalazo/fixes/coverage_combine

Steve Peak · web-flow · commit 3892a1e2533e · 2018-01-17T13:15:24.000+01:00
coverage combine does not delete .coverage file if present
diff --git a/codecov/__init__.py b/codecov/__init__.py
@@ -657,11 +657,14 @@ def main(*argv, **kwargs):
             # Call `coverage xml` when .coverage exists
             # -----------------------------------------
             # Ran from current directory
-            if os.path.exists(opj(os.getcwd(), '.coverage')) and not os.path.exists(opj(os.getcwd(), 'coverage.xml')):
-                if glob.glob(opj(os.getcwd(), '.coverage.*')):
-                    write('    Mergeing coverage reports')
-                    try_to_run('coverage combine')
+            if glob.glob(opj(os.getcwd(), '.coverage.*')):
+                write('    Mergeing coverage reports')
+                # The `-a` option is mandatory here. If we 
+                # have a `.coverage` in the current directory, calling 
+                # without the option would delete the previous data
+                try_to_run('coverage combine -a')
 
+            if os.path.exists(opj(os.getcwd(), '.coverage')) and not os.path.exists(opj(os.getcwd(), 'coverage.xml')):
                 write('    Generating coverage xml reports for Python')
                 # using `-i` to ignore "No source for code" error
                 try_to_run('coverage xml -i')
