diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2020-04-15 16:26:34 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2020-04-15 20:25:49 +0300 |
commit | 2cc5b63b5f90d2dd9b05f50ac28e379d417f1a8c (patch) | |
tree | 38238377b042a159fb9bf633e7b8e3853f0fd980 /tests/upload-dry.at | |
parent | 44ad5cfe84f1cd1d7b6de35ae251f1caf69450d8 (diff) | |
download | wydawca-2cc5b63b5f90d2dd9b05f50ac28e379d417f1a8c.tar.gz wydawca-2cc5b63b5f90d2dd9b05f50ac28e379d417f1a8c.tar.bz2 |
Use job scheduler when processing all spools.alpha-3.1.90
* src/job.c (job_printable): Improve job identification.
(wydawca_scanner): Don't log statistics in single process mode.
(job_queue_wait): New function.
* src/net.c (wydawca_listener): Move the call to job_init to main.
* src/process.c (scan_spool_unlocked): Enqueue the triplet.
Don't call spool_commit_triplets
* src/triplet.c (remove_triplet): Omit checks in dry-run mode.
(triplet_processor,spool_commit_triplets)
(count_collected_triplets): Remove.
* src/wydawca.c (main): Call job_queue_wait if not daemon.
* tests/inotify-unatt01.at: Update expected output.
* tests/upload-dry.at: Likewise.
Diffstat (limited to 'tests/upload-dry.at')
-rw-r--r-- | tests/upload-dry.at | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/upload-dry.at b/tests/upload-dry.at index 8245552..7a53e4f 100644 --- a/tests/upload-dry.at +++ b/tests/upload-dry.at @@ -22,11 +22,11 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) star wydawca: [[DEBUG]] ./source/ok -> ./dest wydawca: [[DEBUG]] ./source/fail -> ./dest wydawca: [[DEBUG]] ./source/test -> ./dest -wydawca: [[DEBUG]] processing spool test (./dest) -wydawca: [[DEBUG]] FILE file, DIST=file, SIG=file.sig, DIRECTIVE=file.directive.asc wydawca: [[DEBUG]] Good signature from Wydawca (Testsuite) <bug-wydawca@gnu.org.ua> wydawca: [[DEBUG]] file: directive file signature OK wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1 +wydawca: [[DEBUG]] scheduling job triplet(test,file) +wydawca: [[DEBUG]] starting job: triplet(test,file) wydawca: [[DEBUG]] processing triplet `file' wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite wydawca: [[DEBUG]] good detached signature for file @@ -46,6 +46,7 @@ wydawca: [[INFO]] files archived: 0 wydawca: [[INFO]] symlinks created: 0 wydawca: [[INFO]] symlinks removed: 0 wydawca: [[INFO]] check failures: 0 +wydawca: [[DEBUG]] removing job: triplet(test,file) wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished ]) @@ -57,7 +58,7 @@ set -e wydawca $WY_FORCE --no-preproc --dry-run -c wydawca.cf 2>err set +e grep "found file" err | sort -grep -v "found file" err | cwdrepl >&2 +sed -e '/found file/d' -e '/exited successfully/d' err | cwdrepl >&2 ], [0], [wydawca: [[DEBUG]] found file file.directive.asc: signed upload directive, stem: file |