fix(coverage): fix coverage count for branch coverage

If branch coverage is collected, show partial lines as not covered (#121)

coveralls/reporter.py

@@ -56,9 +56,13 @@ def get_hits(self, line_num, analysis):
         """
         if line_num in analysis.missing:
             return 0
-        if line_num in analysis.statements:
+        if line_num not in analysis.statements:
+            return None
+        if not analysis.has_arcs():
             return 1
-        return None
+        if line_num in analysis.missing_branch_arcs():
+            return 0
+        return 1
 
     def parse_file(self, cu, analysis):
         """ Generate data for single file """

example/project.py

@@ -10,4 +10,10 @@ class Foo(object):
 
 
 def baz():
-    print('this is not tested')
+    print('this is not tested')
+
+def branch(cond1, cond2):
+    if cond1:
+        print('condition tested both ways')
+    if cond2:
+        print('condition not tested both ways')

example/runtests.py

@@ -1,5 +1,7 @@
 # coding: utf-8
-from project import hello
+from project import hello, branch
 
 if __name__ == '__main__':
-    hello()
+    hello()
+    branch(False, True)
+    branch(True, True)

tests/test_api.py

@@ -183,12 +183,24 @@ def test_reporter(self):
         results = self.cover.get_coverage()
         assert len(results) == 2
         assert_coverage({
-            'source': '# coding: utf-8\n\n\ndef hello():\n    print(\'world\')\n\n\nclass Foo(object):\n    """ Bar """\n\n\ndef baz():\n    print(\'this is not tested\')',
+            'source': '# coding: utf-8\n\n\ndef hello():\n    print(\'world\')\n\n\nclass Foo(object):\n    """ Bar """\n\n\ndef baz():\n    print(\'this is not tested\')\n\ndef branch(cond1, cond2):\n    if cond1:\n        print(\'condition tested both ways\')\n    if cond2:\n        print(\'condition not tested both ways\')',
             'name': 'project.py',
-            'coverage': [None, None, None, 1, 1, None, None, 1, None, None, None, 1, 0]}, results[0])
+            'coverage': [None, None, None, 1, 1, None, None, 1, None, None, None, 1, 0, None, 1, 1, 1, 1, 1]}, results[0])
         assert_coverage({
-            'source': "# coding: utf-8\nfrom project import hello\n\nif __name__ == '__main__':\n    hello()",
-            'name': 'runtests.py', 'coverage': [None, 1, None, 1, 1]}, results[1])
+            'source': "# coding: utf-8\nfrom project import hello, branch\n\nif __name__ == '__main__':\n    hello()\n    branch(False, True)\n    branch(True, True)",
+            'name': 'runtests.py', 'coverage': [None, 1, None, 1, 1, 1, 1]}, results[1])
+
+    def test_reporter_with_branches(self):
+        sh.coverage('run', '--branch', 'runtests.py')
+        results = self.cover.get_coverage()
+        assert len(results) == 2
+        assert_coverage({
+            'source': '# coding: utf-8\n\n\ndef hello():\n    print(\'world\')\n\n\nclass Foo(object):\n    """ Bar """\n\n\ndef baz():\n    print(\'this is not tested\')\n\ndef branch(cond1, cond2):\n    if cond1:\n        print(\'condition tested both ways\')\n    if cond2:\n        print(\'condition not tested both ways\')',
+            'name': 'project.py',
+            'coverage': [None, None, None, 1, 1, None, None, 1, None, None, None, 1, 0, None, 1, 1, 1, 0, 1]}, results[0])
+        assert_coverage({
+            'source': "# coding: utf-8\nfrom project import hello, branch\n\nif __name__ == '__main__':\n    hello()\n    branch(False, True)\n    branch(True, True)",
+            'name': 'runtests.py', 'coverage': [None, 1, None, 0, 1, 1, 1]}, results[1])
 
     def test_missing_file(self):
         sh.echo('print("Python rocks!")', _out="extra.py")