diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2020-05-17 17:09:18 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2020-05-17 17:09:18 +0300 |
commit | 49de98a30b8b5b45d30bcd4b8136a5b4cfe80fcd (patch) | |
tree | 459b3abe97d815dd40838be408998b3520ed9142 /tests | |
parent | ebeb897b2b4f81224d541c6711b76e1c360e377a (diff) | |
download | wydawca-49de98a30b8b5b45d30bcd4b8136a5b4cfe80fcd.tar.gz wydawca-49de98a30b8b5b45d30bcd4b8136a5b4cfe80fcd.tar.bz2 |
Fix deadlock at wy_vlog
* src/stat.c: New file.
* src/wydawca.c (wy_log): Don't touch statistic counters. This causes
deadlock when wy_v?log is called from statistic-reporting module.
* src/wydawca.h (wydawca_stat_log): Remove proto.
* src/gpg.c: Increase WY_STAT_ERRORS explicitly.
* src/triplet.c: Likewise.
* src/verify.c: Likewise.
* tests/dry_run01.at: Fix expected output.
* tests/upload01.at: Likewise.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/dry_run01.at | 2 | ||||
-rw-r--r-- | tests/upload01.at | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/dry_run01.at b/tests/dry_run01.at index 387a9da..ff7294b 100644 --- a/tests/dry_run01.at +++ b/tests/dry_run01.at | |||
@@ -63,7 +63,7 @@ sed -e 's/incomplete triplets: 1/incomplete triplets: 0/' err >&2 | |||
63 | [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started | 63 | [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started |
64 | wydawca: [[ERR]] No public key | 64 | wydawca: [[ERR]] No public key |
65 | wydawca: [[ERR]] invalid signature for conversion-1.1.tar | 65 | wydawca: [[ERR]] invalid signature for conversion-1.1.tar |
66 | wydawca: [[INFO]] errors: 2 | 66 | wydawca: [[INFO]] errors: 0 |
67 | wydawca: [[INFO]] warnings: 0 | 67 | wydawca: [[INFO]] warnings: 0 |
68 | wydawca: [[INFO]] bad signatures: 1 | 68 | wydawca: [[INFO]] bad signatures: 1 |
69 | wydawca: [[INFO]] access violation attempts: 1 | 69 | wydawca: [[INFO]] access violation attempts: 1 |
diff --git a/tests/upload01.at b/tests/upload01.at index 279599e..be25c25 100644 --- a/tests/upload01.at +++ b/tests/upload01.at | |||
@@ -71,7 +71,7 @@ upload dir | |||
71 | [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started | 71 | [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started |
72 | wydawca: [[ERR]] No public key | 72 | wydawca: [[ERR]] No public key |
73 | wydawca: [[ERR]] invalid signature for conversion-1.1.tar | 73 | wydawca: [[ERR]] invalid signature for conversion-1.1.tar |
74 | wydawca: [[INFO]] errors: 2 | 74 | wydawca: [[INFO]] errors: 0 |
75 | wydawca: [[INFO]] warnings: 0 | 75 | wydawca: [[INFO]] warnings: 0 |
76 | wydawca: [[INFO]] bad signatures: 1 | 76 | wydawca: [[INFO]] bad signatures: 1 |
77 | wydawca: [[INFO]] access violation attempts: 1 | 77 | wydawca: [[INFO]] access violation attempts: 1 |