Merge pull request #97 from xolox/master

Improve support for AppVeyor CI
TheKevJames · Nov 6, 2015 · 1a62ce2 · 1a62ce2
2 parents f7888c6 + bd717bc
commit 1a62ce2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/coveralls/api.py b/coveralls/api.py
@@ -56,6 +56,12 @@ def __init__(self, token_required=True, **kwargs):
             self.config['service_job_id'] = os.environ.get('CIRCLE_BUILD_NUM')
             if os.environ.get('CI_PULL_REQUEST', None):
                 self.config['service_pull_request'] = os.environ.get('CI_PULL_REQUEST').split('/')[-1]
+        elif os.environ.get('APPVEYOR'):
+            is_travis_or_circle = False
+            self.config['service_name'] = file_config.get('service_name', None) or 'appveyor'
+            self.config['service_job_id'] = os.environ.get('APPVEYOR_BUILD_ID')
+            if os.environ.get('APPVEYOR_PULL_REQUEST_NUMBER'):
+                self.config['service_pull_request'] = os.environ['APPVEYOR_PULL_REQUEST_NUMBER']
         else:
             is_travis_or_circle = False
             self.config['service_name'] = file_config.get('service_name') or self.default_client
@@ -204,7 +210,10 @@ def git_info(self):
                 'committer_email': gitlog('%ce'),
                 'message': gitlog('%s'),
             },
-            'branch': os.environ.get('CIRCLE_BRANCH') or os.environ.get('CI_BRANCH') or os.environ.get('TRAVIS_BRANCH', rev),
+            'branch': (os.environ.get('CIRCLE_BRANCH') or
+                       os.environ.get('APPVEYOR_REPO_BRANCH') or
+                       os.environ.get('CI_BRANCH') or
+                       os.environ.get('TRAVIS_BRANCH', rev)),
             #origin	git@github.com:coagulant/coveralls-python.git (fetch)
             'remotes': [{'name': line.split()[0], 'url': line.split()[1]}
                         for line in run_command('git', 'remote', '-v').splitlines() if '(fetch)' in line]

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -94,6 +94,15 @@ def test_circleci_no_config(self):
         assert cover.config['service_job_id'] == '888'
         assert cover.config['service_pull_request'] == '9999'
 
+    @patch.dict(os.environ, {'APPVEYOR': 'True',
+                             'APPVEYOR_BUILD_ID': '1234567',
+                             'APPVEYOR_PULL_REQUEST_NUMBER': '1234'}, clear=True)
+    def test_appveyor_no_config(self):
+        cover = Coveralls(repo_token='xxx')
+        assert cover.config['service_name'] == 'appveyor'
+        assert cover.config['service_job_id'] == '1234567'
+        assert cover.config['service_pull_request'] == '1234'
+
 
 class Git(GitBasedTest):