ft

stevepeak · stevepeak · commit 0202c276adac · 2016-04-27T09:42:08.000-04:00
diff --git a/codecov/__init__.py b/codecov/__init__.py
@@ -289,8 +289,8 @@ def main(*argv, **kwargs):
 
             # Merge Commits
             # -------------
-            res = try_to_run('git log -1 --pretty=%B').strip()
-            if is_merge_commit(res):
+            res = try_to_run('git log -1 --pretty=%B')
+            if res and is_merge_commit.match(res.strip()):
                 query['commit'] = res.split(' ')[1]
 
         # --------
@@ -638,11 +638,14 @@ def main(*argv, **kwargs):
                                      '''$(find "%(root)s" -type f -name '*.php'   -exec grep -nIH '^[[:space:]]*}$' {} \;)\n'''
                                      '''$(find "%(root)s" -type f -name '*.php'   -exec grep -nIH '^[[:space:]]*{' {} \;)"\n'''
                                      '''"''' % dict(root=root))
-            write("  --> Found %s adjustments" % (adjustments.count('\n') - adjustments.count('\n\n') - 1))
-            try:
-                reports = str(reports) + '\n# path=fixes\n' + str(adjustments.encode('utf-8')) + '<<<<<< EOF'
-            except:
-                reports = str(reports) + '\n# path=fixes\n' + str(remove_non_ascii(adjustments)) + '<<<<<< EOF'
+            if adjustments:
+                write("  --> Found %s adjustments" % (adjustments.count('\n') - adjustments.count('\n\n') - 1))
+                try:
+                    reports = str(reports) + '\n# path=fixes\n' + str(adjustments.encode('utf-8')) + '<<<<<< EOF'
+                except:
+                    reports = str(reports) + '\n# path=fixes\n' + str(remove_non_ascii(adjustments)) + '<<<<<< EOF'
+            else:
+                write("  --> Found no adjustments")
 
         result = ''
         if codecov.dump:
diff --git a/tests/test.py b/tests/test.py
@@ -143,7 +143,7 @@ def test_send(self):
                     f.write('coverage data')
                 res = self.run_cli(False, commit='a'*40, branch='master', token='<token>')
                 self.assertEqual(res['result'].strip(), 'target')
-                assert 'https://codecov.io/upload/v3?' in post.call_args[0][0]
+                assert 'https://codecov.io/upload/v4?' in post.call_args[0][0]
                 assert 'commit=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' in post.call_args[0][0]
                 assert 'token=%3Ctoken%3E' in post.call_args[0][0]
                 assert 'branch=master' in post.call_args[0][0]
@@ -265,14 +265,6 @@ def test_discovers(self):
         self.assertIn('jacoco.xml', res['reports'])
         self.assertIn('<jacoco></jacoco>', res['reports'])
 
-    def test_jacoco(self):
-        with open(self.jacoco, 'w+') as f:
-            f.write('<jacoco></jacoco>')
-        res = self.run_cli(file='jacoco.xml', **self.defaults)
-        report = res['reports'].split('<<<<<< network\n')[1].splitlines()
-        self.assertEqual(report[0], '# path=jacoco.xml')
-        self.assertEqual(report[1], '<jacoco></jacoco>')
-
     def test_not_jacoco(self):
         with open(self.filepath, 'w+') as f:
             f.write('<data>')
