Skip to content

Commit

Permalink
Merge bd5b340 into af86371
Browse files Browse the repository at this point in the history
  • Loading branch information
josephharrington committed Dec 24, 2016
2 parents af86371 + bd5b340 commit bbb98a8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions coveralls/__init__.py
Expand Up @@ -55,6 +55,7 @@ def parse_args():
parser.add_argument('--ignore-errors', '-i', help='ignore errors while reading source files', action='store_true', default=False)
parser.add_argument('--merge_file', '-m', help='json file containing coverage data to be merged (for merging javascript coverage)', default=None)
parser.add_argument('--nogit', help='do not gather git repo info', action='store_true', default=False)
parser.add_argument('--skip_ssl_verify', help='skip ssl certificate verification when communicating with the coveralls server', action='store_true', default=False)
args = parser.parse_args()
args.base_dir = os.path.abspath(args.base_dir)
args.data_file = os.path.join(args.base_dir, args.data_file) if args.data_file else None
Expand Down Expand Up @@ -93,6 +94,7 @@ def wear(args=None):
git=repo(args.base_dir) if not args.nogit else {},
source_files=coverage.coveralls(args.base_dir, ignore_errors=args.ignore_errors, merge_file=args.merge_file),
parallel=args.parallel,
skip_ssl_verify=args.skip_ssl_verify,
)
logger.info(response.status_code)
logger.info(response.text)
Expand Down
4 changes: 2 additions & 2 deletions coveralls/api.py
Expand Up @@ -3,9 +3,9 @@
import requests


def post(url, repo_token, service_job_id, service_name, git, source_files, parallel):
def post(url, repo_token, service_job_id, service_name, git, source_files, parallel, skip_ssl_verify=False):
json_file = build_file(repo_token, service_job_id, service_name, git, source_files, parallel)
return requests.post(url, files={'json_file': json_file})
return requests.post(url, files={'json_file': json_file}, verify=(not skip_ssl_verify))


def build_file(repo_token, service_job_id, service_name, git, source_files, parallel):
Expand Down
1 change: 1 addition & 0 deletions coveralls/tests.py
Expand Up @@ -23,6 +23,7 @@ class Arguments(object):
merge_file = os.path.join(base_dir, 'merge.json')
parallel = True
nogit = False
skip_ssl_verify = False


GIT_EXP = {
Expand Down

0 comments on commit bbb98a8

Please sign in to comment.