diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/coverage.md | 4 | ||||
| -rw-r--r-- | test/rspamd_cryptobox_test.c | 10 | ||||
| -rw-r--r-- | test/rspamd_mem_pool_test.c | 4 | ||||
| -rw-r--r-- | test/rspamd_test_suite.c | 2 | ||||
| -rwxr-xr-x | test/tools/dump_coveralls.py | 2 | ||||
| -rwxr-xr-x | test/tools/gcov_coveralls.py | 14 | ||||
| -rwxr-xr-x | test/tools/http_put.py | 2 | ||||
| -rwxr-xr-x | test/tools/merge_coveralls.py | 2 |
8 files changed, 20 insertions, 20 deletions
diff --git a/test/coverage.md b/test/coverage.md index c5ee8b071..8d177f318 100644 --- a/test/coverage.md +++ b/test/coverage.md @@ -28,7 +28,7 @@ However, there are some moment to highlight: - To make it possible, we explicitly run `umask 0000` in "build" and "functional" stages in .circleci/config.yml - After run, we persist coverage data in "coverage.${CIRCLE\_JOB}.dump" during this build flow, see `capture_coverage_data`, to use it on the final stage. -- we user `cpp-coverals` because it is able to save data for coveralls without actually sending it. We send on our own +- we use `cpp-coveralls` because it is able to save data for coveralls without actually sending it. We send on our own along with Lua-coverage. Lua coverage @@ -40,7 +40,7 @@ First part contains nothing interesting, just see `test/lua/tests.lua`. 1. Coverage collecting is initiated and dumped in `test/functional/lua/test_coverage.lua` (there are a lot of comments inside). This file should be included on the very early stage of test run. Usually it's included via config. -2. Coverage is dumped into ${TMPDIR}/%{woker_name}.luacov.stats.out +2. Coverage is dumped into ${TMPDIR}/%{worker_name}.luacov.stats.out 3. All worker coverage reports are merged into `lua_coverage_report.json` (see `collect_lua_coverage()`) 4. finally, `lua_coverage_report.json` is persisted in build flow (see `functional` stage) diff --git a/test/rspamd_cryptobox_test.c b/test/rspamd_cryptobox_test.c index b0d02160a..15386c52c 100644 --- a/test/rspamd_cryptobox_test.c +++ b/test/rspamd_cryptobox_test.c @@ -124,7 +124,7 @@ create_realistic_split (struct rspamd_cryptobox_segment *seg, int mseg, } static int -create_constrainted_split (struct rspamd_cryptobox_segment *seg, int mseg, +create_constrained_split (struct rspamd_cryptobox_segment *seg, int mseg, int constraint, guchar *begin, guchar *end) { @@ -291,14 +291,14 @@ start: msg_info ("realistic split of %d chunks encryption: %.0f", cnt, t2 - t1); - cnt = create_constrainted_split (seg, max_seg + 1, 32, begin, end); + cnt = create_constrained_split (seg, max_seg + 1, 32, begin, end); t1 = rspamd_get_ticks (TRUE); rspamd_cryptobox_encryptv_nm_inplace (seg, cnt, nonce, key, mac, mode); t2 = rspamd_get_ticks (TRUE); check_result (key, nonce, mac, begin, end); - msg_info ("constrainted split of %d chunks encryption: %.0f", cnt, t2 - t1); + msg_info ("constrained split of %d chunks encryption: %.0f", cnt, t2 - t1); for (i = 0; i < random_fuzz_cnt; i ++) { ms = ottery_rand_range (i % max_seg * 2) + 1; @@ -328,7 +328,7 @@ start: } for (i = 0; i < random_fuzz_cnt; i ++) { ms = ottery_rand_range (i % max_seg * 10) + 1; - cnt = create_constrainted_split (seg, ms, i, begin, end); + cnt = create_constrained_split (seg, ms, i, begin, end); t1 = rspamd_get_ticks (TRUE); rspamd_cryptobox_encryptv_nm_inplace (seg, cnt, nonce, key, mac, mode); t2 = rspamd_get_ticks (TRUE); @@ -336,7 +336,7 @@ start: check_result (key, nonce, mac, begin, end); if (i % 1000 == 0) { - msg_info ("constrainted fuzz iterations: %d", i); + msg_info ("constrained fuzz iterations: %d", i); } } diff --git a/test/rspamd_mem_pool_test.c b/test/rspamd_mem_pool_test.c index 61b4efe3f..b7e0f0811 100644 --- a/test/rspamd_mem_pool_test.c +++ b/test/rspamd_mem_pool_test.c @@ -8,8 +8,8 @@ #include <sys/wait.h> #endif -#define TEST_BUF "test bufffer" -#define TEST2_BUF "test bufffertest bufffer" +#define TEST_BUF "test buffer" +#define TEST2_BUF "test buffertest buffer" void rspamd_mem_pool_test_func () diff --git a/test/rspamd_test_suite.c b/test/rspamd_test_suite.c index 62b22616a..ae19fd75c 100644 --- a/test/rspamd_test_suite.c +++ b/test/rspamd_test_suite.c @@ -35,7 +35,7 @@ main (int argc, char **argv) rspamd_main->server_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), NULL, 0); cfg = rspamd_config_new (RSPAMD_CONFIG_INIT_DEFAULT); cfg->libs_ctx = rspamd_init_libs (); - /* More agressive GC, workaround for 'not enough memory' test failures */ + /* More aggressive GC, workaround for 'not enough memory' test failures */ cfg->lua_gc_step *= 2; rspamd_main->cfg = cfg; cfg->cfg_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), NULL, 0); diff --git a/test/tools/dump_coveralls.py b/test/tools/dump_coveralls.py index c453d0511..a96dc9242 100755 --- a/test/tools/dump_coveralls.py +++ b/test/tools/dump_coveralls.py @@ -30,7 +30,7 @@ def dump_file(json_file): warn("{}: no source_files, not a coveralls.io payload?".format(json_file)) return 1 - print("{} ({} soource files)".format(json_file, len(data['source_files']))) + print("{} ({} source files)".format(json_file, len(data['source_files']))) for src_file in sorted(data['source_files'], key=itemgetter('name')): covered_lines = not_skipped_lines = 0 diff --git a/test/tools/gcov_coveralls.py b/test/tools/gcov_coveralls.py index ee441853f..dcbd93f5b 100755 --- a/test/tools/gcov_coveralls.py +++ b/test/tools/gcov_coveralls.py @@ -13,15 +13,15 @@ gcov(1) utility can be used to get information from *.gcda file and write text reports to *.gocov file (one file for each source file from which object was compiled). The script finds *.gcno files, uses gcov to generate *.gcov files, parses them -and accomulates statistics for all source files. +and accumulates statistics for all source files. This script was written with quite a few assumptions: * Code was build using absolute path to source directory (and absolute path - stored in object file debug sylmbols). + stored in object file debug symbols). * Current directory is writable and there is no useful *.gcov files in it - (becase they will be deleted). + (because they will be deleted). * Object file has same base name as *.gcno file (e. g. foo.c.gcno and foo.c.o). This is the case for cmake builds, but probably not for other build systems @@ -101,7 +101,7 @@ def main(): '-v', '--verbose', action="store_true", - help='Display additional informaton and gcov command output.') + help='Display additional information and gcov command output.') parser.add_argument( '-e', '--exclude', @@ -109,14 +109,14 @@ def main(): metavar='DIR', help= ("Don't look for .gcno/.gcda files in this directories (repeat option to skip several directories). " - "Path is relative to the dirictory where script was started, e. g. '.git'")) + "Path is relative to the directory where script was started, e. g. '.git'")) parser.add_argument( '-p', '--prefix', action='append', help= ("Strip this prefix from absolute path to source file. " - "If this option is provided, then only files with given prefixex in absolute path " + "If this option is provided, then only files with given prefixes in absolute path " "will be added to coverage (option can be repeated).")) parser.add_argument( '--out', @@ -169,7 +169,7 @@ def main(): # skip file outside given prefixes # it can be e. g. library include file if args.verbose: - warn('file "{}" is not mathced by prefix, skipping'.format(src_file)) + warn('file "{}" is not matched by prefix, skipping'.format(src_file)) continue try: diff --git a/test/tools/http_put.py b/test/tools/http_put.py index de2dad3d7..8ede68ee8 100755 --- a/test/tools/http_put.py +++ b/test/tools/http_put.py @@ -12,7 +12,7 @@ import requests def main(): parser = argparse.ArgumentParser( - description='Upload a file usgin HTTP PUT method', + description='Upload a file using HTTP PUT method', epilog=( "To use HTTP Auth set HTTP_PUT_AUTH environment variable to user:password\n" "Example: %(prog)s file1 file2 https://example.com/dir/")) diff --git a/test/tools/merge_coveralls.py b/test/tools/merge_coveralls.py index 36a616262..ff6736f6e 100755 --- a/test/tools/merge_coveralls.py +++ b/test/tools/merge_coveralls.py @@ -172,4 +172,4 @@ if __name__ == '__main__': if 'url' in response: print("[coveralls] Uploaded to %s" % response['url']) except json.decoder.JSONDecodeError: - print("Bad resonse: '%s'" % r.text) + print("Bad response: '%s'" % r.text) |