diff options
author | Anton Yuzhaninov <citrin+git@citrin.ru> | 2018-10-20 04:15:40 -0400 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-10-20 09:15:40 +0100 |
commit | 97a9de385402020d3add12517c7bccae93af593b (patch) | |
tree | ff53c36cd794f85f2159cbea19ed3bd7a1466583 /test/functional/util | |
parent | 97662a53f4dce272df30dac9b6aa4fc4013b0fc4 (diff) | |
download | rspamd-97a9de385402020d3add12517c7bccae93af593b.tar.gz rspamd-97a9de385402020d3add12517c7bccae93af593b.zip |
Fix coverage (#2603)
* Add utility to prepare C coverage for upload to coveralls.io
It turned out that it is more easy to write own script then debug
and fix coveralls utility (https://github.com/eddyxu/cpp-coveralls).
gcov-coveralls.py can be used as a replacement for coveralls.
* Save coverage data from .gcda files only once
Coverage data in .gcda files is merged after each binary invocation,
so we can run all test and then gather coverage data.
If we dump them two times execution counts will be more then they be.
* Switch from coveralls (cpp-coveralls) to own script
Problem with coveralls was, that coverage for source files outside build
directory was not added to the report.
* Add tool to dump info from json for coveralls.io
* Add debug
* Fix: don't die if there is no service_job_id in json
* Debug
* Fix dump_coveralls.py
* Rename to gcov_coveralls.py (s/-/_/)
For most files in this repo '_' is used as separator.
* Don't add source code to coveralls JSON
According to https://docs.coveralls.io/api-introduction
Coverals don't need source code, only MD5 digest to tracks changes.
Anyway source code is already added by luacov-coveralls and source_digest
is added by cpp-coveralls and gcov_coveralls.py
Both options seems to work for now.
* Provide path to source directory to merge_coveralls.py
merge_coveralls.py has code to filter files and remove prefixes.
When --root points to source directory merge_coveralls.py can strip
prefix from absolute path in JSONs generated by luacov-coveralls.
* Style
Don't add parameters with default values.
* Make --output optional
It useful mainly for debugging. We can send report without saving it.
* Log CI_COMMIT_AUTHOR env var
It is not clear from drone.io source how CI_COMMIT_AUTHOR variable is
set. Log it to see what it means.
* Move merge_coveralls.py to test/tools
This script is used not only for funcional test coverage, but for
rspamd-test coverage too.
* Remove debug
* Style
Use more compact formatting.
* Write comment about parallel tests running [SKIP CI]
Document why running tests in parallel may be bad idea (but still do so).
* Fix typo [SKIP CI]
Diffstat (limited to 'test/functional/util')
-rwxr-xr-x | test/functional/util/merge_coveralls.py | 177 |
1 files changed, 0 insertions, 177 deletions
diff --git a/test/functional/util/merge_coveralls.py b/test/functional/util/merge_coveralls.py deleted file mode 100755 index c3976b48f..000000000 --- a/test/functional/util/merge_coveralls.py +++ /dev/null @@ -1,177 +0,0 @@ -#!/usr/bin/env python3 - -from __future__ import print_function - -import argparse -import json -import os -import sys -import codecs - -import requests - -# Python 2/3 compatibility -if sys.version_info.major > 2: - xrange = range - -# install path to repository mapping -# if path mapped to None, it means that the file should be ignored (i.e. test file/helper) -# first matched path counts. -# terminating slash should be added for directories -path_mapping = [ - ("${install-dir}/share/rspamd/lib/fun.lua", None), - ("${install-dir}/share/rspamd/lib/", "lualib/"), - ("${install-dir}/share/rspamd/rules/" , "rules/"), - ("${install-dir}/share/rspamd/lib/torch/" , None), - ("${build-dir}/CMakeFiles/", None), - ("${build-dir}/contrib/", None), - ("${build-dir}/test", None), - ("${project-root}/test/lua/", None), - ("${project-root}/test/", None), - ("${project-root}/clang-plugin/", None), - ("${project-root}/CMakeFiles/", None), - ("${project-root}/contrib/", None), - ("${project-root}/", ""), - ("contrib/", None), - ("CMakeFiles/", None), -] - -parser = argparse.ArgumentParser(description='') -parser.add_argument('--input', type=str, required=True, nargs='+', help='input files') -parser.add_argument('--output', type=str, required=True, help='output file)') -parser.add_argument('--root', type=str, required=False, default="/rspamd/src/github.com/rspamd/rspamd", help='repository root)') -parser.add_argument('--install-dir', type=str, required=False, default="/rspamd/install", help='install root)') -parser.add_argument('--build-dir', type=str, required=False, default="/rspamd/build", help='build root)') -parser.add_argument('--token', type=str, help='If present, the file will be uploaded to coveralls)') - -def merge_coverage_vectors(c1, c2): - assert(len(c1) == len(c2)) - - for i in range(0, len(c1)): - if c1[i] is None and c2[i] is None: - pass - elif type(c1[i]) is int and c2[i] is None: - pass - elif c1[i] is None and type(c2[i]) is int: - c1[i] = c2[i] - elif type(c1[i]) is int and type(c2[i]) is int: - c1[i] += c2[i] - else: - raise RuntimeError("bad element types at %d: %s, %s", i, type(c1[i]), type(c1[i])) - - return c1 - - -def normalize_name(name): - name = os.path.normpath(name) - if not os.path.isabs(name): - name = os.path.abspath(repository_root + "/" + name) - for k in path_mapping: - if name.startswith(k[0]): - if k[1] is None: - return None - else: - name = k[1] + name[len(k[0]):] - break - return name - -def merge(files, j1): - for sf in j1['source_files']: - name = normalize_name(sf['name']) - if name is None: - continue - if name in files: - files[name]['coverage'] = merge_coverage_vectors(files[name]['coverage'], sf['coverage']) - else: - sf['name'] = name - files[name] = sf - if not ('source' in sf): - path = "%s/%s" % (repository_root, sf['name']) - if os.path.isfile(path): - with open(path) as f: - files[name]['source'] = f.read() - - return files - -def prepare_path_mapping(): - for i in range(0, len(path_mapping)): - new_key = path_mapping[i][0].replace("${install-dir}", install_dir) - new_key = new_key.replace("${project-root}", repository_root) - new_key = new_key.replace("${build-dir}", build_dir) - - path_mapping[i] = (new_key, path_mapping[i][1]) - -if __name__ == '__main__': - args = parser.parse_args() - - repository_root = os.path.abspath(os.path.expanduser(args.root)) - install_dir = os.path.normpath(os.path.expanduser(args.install_dir)) - build_dir = os.path.normpath(os.path.expanduser(args.build_dir)) - - prepare_path_mapping() - - with codecs.open(args.input[0], 'r', encoding='utf-8') as fh: - j1 = json.load(fh) - - files = merge({}, j1) - for i in range(1, len(args.input)): - with codecs.open(args.input[i], 'r', encoding='utf-8') as fh: - j2 = json.load(fh) - - files = merge(files, j2) - - if 'git' not in j1 and 'git' in j2: - j1['git'] = j2['git'] - if 'service_name' not in j1 and 'service_name' in j2: - j1['service_name'] = j2['service_name'] - if 'service_job_id' not in j1 and 'service_job_id' in j2: - j1['service_job_id'] = j2['service_job_id'] - - if not j1['service_job_id'] and 'CIRCLE_BUILD_NUM' in os.environ: - j1['service_job_id'] = os.environ['CIRCLE_BUILD_NUM'] - - if 'CIRCLECI' in os.environ and os.environ['CIRCLECI']: - j1['service_name'] = 'circleci' - elif os.getenv('CI') == 'drone': - j1['service_name'] = 'drone' - j1['service_branch'] = os.getenv('CI_COMMIT_BRANCH') - j1['service_build_url'] = os.getenv('DRONE_BUILD_LINK') - j1['service_job_id'] = os.getenv('CI_JOB_NUMBER') - j1['service_number'] = os.getenv('CI_BUILD_NUMBER') - j1['commit_sha'] = os.getenv('CI_COMMIT_SHA') - if os.getenv('CI_BUILD_EVENT') == 'pull_request': - j1['service_pull_request'] = os.getenv('CI_PULL_REQUEST') - # git data can be filled by cpp-coveralls, but in our layout it can't find repo - # so we can override git info witout merging - j1['git'] = { - 'head': { - 'id': j1['commit_sha'], - 'author_email': os.getenv('CI_COMMIT_AUTHOR_EMAIL'), - 'message': os.getenv('CI_COMMIT_MESSAGE') - }, - 'branch': j1['service_branch'], - 'remotes': [{ - 'name': 'origin', - 'url': os.getenv('CI_REPO_REMOTE') - }] - } - - - j1['source_files'] = list(files.values()) - - with open(args.output, 'w') as f: - f.write(json.dumps(j1)) - - if args.token: - j1['repo_token'] = args.token - print("sending data to coveralls...") - r = requests.post('https://coveralls.io/api/v1/jobs', files={"json_file": json.dumps(j1)}) - response = r.json() - print("[coveralls] %s" % response['message']) - if 'url' in response: - print("[coveralls] Uploaded to %s" % response['url']) - - # post https://coveralls.io/api/v1/jobs - # print args - - |