diff options
Diffstat (limited to 'tests')
46 files changed, 227 insertions, 119 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index db47063..c9b5e8e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ # This file is part of Wydawca -# Copyright (C) 2009-2013, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2013, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -54,6 +54,8 @@ TESTSUITE_AT = \ upload03.at\ upload04.at\ upload05.at\ + verify.at\ + spoolsrc.at\ symlink00.at\ symlink01.at\ rmsymlink00.at\ diff --git a/tests/atlocal.in b/tests/atlocal.in index f1307f4..e74149a 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,6 +1,6 @@ # @configure_input@ -*- shell-script -*- # Configurable variable values for Wydawca test suite. -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2023 Sergey Poznyakoff PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH @@ -14,7 +14,7 @@ WY_CONFDST=$WY_TESTDIR/etc WY_PROJECTDB=$WY_CONFSRC/project WY_MAILUTILS=@WY_MAILUTILS@ WY_INOTIFY=@WY_INOTIFY@ -WY_MODDIR=@abs_top_builddir@/modules/mailutils +WY_MODDIR=@abs_top_builddir@/modules/mailutils/.libs GPG="@GPG@" if [ -n "$GPG" ]; then @@ -42,12 +42,14 @@ wy_project_lookup() { grep "^$1:" $WY_PROJECTDB | cut -d: -f$n } -# wy_create_directive [-v X.Y] [-u USER] FILENAME PROJECT [DIRECTIVE: VALUE ...] +# wy_create_directive [-c] [-v X.Y] [-u USER] FILENAME PROJECT [DIRECTIVE: VALUE ...] wy_create_directive() { - local version user + local clear version user while [ $# -ne 0 ] do case $1 in + -c) clear=1 + shift;; -v) version=$2 shift 2;; -u) user=$2 @@ -58,7 +60,9 @@ wy_create_directive() { esac done + if test -z "$clear"; then : ${version:=1.2} + fi local filename="$1.directive" project=$2 shift 2 @@ -66,8 +70,13 @@ wy_create_directive() { echo >&2 "wy_create_directive: odd number of arguments" exit 1 fi - (echo "version: $version" + (if test -n "$version"; then + echo "version: $version" + fi + if test -z "$clear"; then echo "directory: $project" + fi + while [ $# -gt 0 ] do echo "$1 $2" diff --git a/tests/backup00.at b/tests/backup00.at index fa6c63d..16dd6be 100644 --- a/tests/backup00.at +++ b/tests/backup00.at @@ -1,5 +1,5 @@ # This file is part of wydawca testsuite -*- Autotest -*- -# Copyright (C) 2009-2010, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2010, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/backup01.at b/tests/backup01.at index 8c160a0..8dd8c41 100644 --- a/tests/backup01.at +++ b/tests/backup01.at @@ -1,5 +1,5 @@ # This file is part of wydawca testsuite -*- Autotest -*- -# Copyright (C) 2009-2011, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2011, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/backup02.at b/tests/backup02.at index 070ce20..025a2c3 100644 --- a/tests/backup02.at +++ b/tests/backup02.at @@ -1,5 +1,5 @@ # This file is part of wydawca testsuite -*- Autotest -*- -# Copyright (C) 2009-2011, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2011, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/backup03.at b/tests/backup03.at index ec89e28..b8760fe 100644 --- a/tests/backup03.at +++ b/tests/backup03.at @@ -1,5 +1,5 @@ # This file is part of wydawca testsuite -*- Autotest -*- -# Copyright (C) 2009-2011, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2011, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/bkupname.c b/tests/bkupname.c index d97a403..9f95f75 100644 --- a/tests/bkupname.c +++ b/tests/bkupname.c @@ -1,5 +1,5 @@ /* wordsplit - a word splitter - Copyright (C) 2009-2011, 2017, 2019-2020 Sergey Poznyakoff + Copyright (C) 2009-2011, 2017, 2019-2022 Sergey Poznyakoff This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/tests/chargen.c b/tests/chargen.c index 89fb355..42cf9ee 100644 --- a/tests/chargen.c +++ b/tests/chargen.c @@ -21,7 +21,7 @@ -s N Start from character with ordinal number N LICENSE - Copyright (C) 2020 Sergey Poznyakoff + Copyright (C) 2020-2022 Sergey Poznyakoff This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/tests/check-fail.at b/tests/check-fail.at index 4c4b1c9..7e0e8ac 100644 --- a/tests/check-fail.at +++ b/tests/check-fail.at @@ -1,5 +1,5 @@ # Check distribution verification tests - failure -*- Autotest -*- -# Copyright (C) 2010-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2010-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ AT_SETUP([Verification test failure]) AT_KEYWORDS([uploads check-test check-fail]) AT_CHECK_UPLOAD([ spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; check-script "exit 1"; @@ -55,5 +55,3 @@ wydawca: [[INFO]] check failures: 1 wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished ]) AT_CLEANUP - - diff --git a/tests/check-notify.at b/tests/check-notify.at index 63a00a4..11539a7 100644 --- a/tests/check-notify.at +++ b/tests/check-notify.at @@ -1,5 +1,5 @@ # Check distribution verification tests - failure notification -*- Autotest -*- -# Copyright (C) 2010-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2010-2012, 2017, 2019-2023 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ AT_KEYWORDS([uploads check-test check-fail check-fail-notify notify]) AT_CHECK_UPLOAD([ module-prepend-load-path "$WY_MODDIR"; -module mailutils mod_mailutils.la; +module mailutils mod_mailutils.so; module-init mailutils { admin-address "root@localhost"; from-address "wydawca-noreply@localhost"; @@ -29,7 +29,7 @@ module-init mailutils { #include "$WY_CONFSRC/notify.cf" spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; check-script <<EOT @@ -95,5 +95,3 @@ wydawca: [[INFO]] check failures: 1 wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished ]) AT_CLEANUP - - diff --git a/tests/check-ok.at b/tests/check-ok.at index a7090da..c96ba7a 100644 --- a/tests/check-ok.at +++ b/tests/check-ok.at @@ -1,5 +1,5 @@ # Check distribution verification tests - success -*- Autotest -*- -# Copyright (C) 2010-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2010-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ AT_SETUP([Verification test success]) AT_KEYWORDS([uploads check-test check-success check-ok]) AT_CHECK_UPLOAD([ spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; check-script "exit 0"; @@ -52,5 +52,3 @@ wydawca: [[INFO]] check failures: 0 wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished ]) AT_CLEANUP - - diff --git a/tests/cwdrepl.c b/tests/cwdrepl.c index 85ee4ad..4cb5bc0 100644 --- a/tests/cwdrepl.c +++ b/tests/cwdrepl.c @@ -27,7 +27,7 @@ DESCRIPTION of the default dot. LICENSE - Copyright (C) 2017-2020 Sergey Poznyakoff + Copyright (C) 2017-2022 Sergey Poznyakoff This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/tests/dry_run00.at b/tests/dry_run00.at index b8202fd..16941d0 100644 --- a/tests/dry_run00.at +++ b/tests/dry_run00.at @@ -1,5 +1,5 @@ # Check dry-run uploads -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ AT_SETUP([Dry-run upload]) AT_KEYWORDS([upload upload-single upload-success dry-run]) AT_CHECK_UPLOAD([ spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } @@ -49,4 +49,3 @@ wydawca: [[INFO]] check failures: 0 wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished ]) AT_CLEANUP - diff --git a/tests/dry_run01.at b/tests/dry_run01.at index 387a9da..3ad6139 100644 --- a/tests/dry_run01.at +++ b/tests/dry_run01.at @@ -1,5 +1,5 @@ # Check dry-run uploads -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ AT_SETUP([Failed upload]) AT_KEYWORDS([upload upload-single upload-failure dry-run]) AT_CHECK_UPLOAD([ spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } @@ -56,14 +56,16 @@ wydawca --no-preproc --dry-run --debug=0 -c wydawca.cf 2>err # sometimes produce false incomplete triplets. The only fix is to defer # triplet processing to the end of directory scan, which implies a # memory usage overhead. -sed -e 's/incomplete triplets: 1/incomplete triplets: 0/' err >&2 +sed -e 's/incomplete triplets: 1/incomplete triplets: 0/' \ + -e 's/No public key:.*$/No public key/' err >&2 ], [0], [], [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started +wydawca: [[NOTICE]] conversion-1.1.tar.directive.asc: VERSION: 1.2 wydawca: [[ERR]] No public key wydawca: [[ERR]] invalid signature for conversion-1.1.tar -wydawca: [[INFO]] errors: 2 +wydawca: [[INFO]] errors: 0 wydawca: [[INFO]] warnings: 0 wydawca: [[INFO]] bad signatures: 1 wydawca: [[INFO]] access violation attempts: 1 @@ -80,4 +82,3 @@ wydawca: [[INFO]] check failures: 0 wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished ]) AT_CLEANUP - diff --git a/tests/dry_run02.at b/tests/dry_run02.at index 7dcf8f2..8cb4072 100644 --- a/tests/dry_run02.at +++ b/tests/dry_run02.at @@ -1,5 +1,5 @@ # Check dry-run uploads -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ AT_SETUP([Incomplete triplet]) AT_KEYWORDS([upload upload-single upload-inclomplete dry-run]) AT_CHECK_UPLOAD([ spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } @@ -48,4 +48,3 @@ wydawca: [[INFO]] check failures: 0 wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished ]) AT_CLEANUP - diff --git a/tests/etc/Makefile.am b/tests/etc/Makefile.am index 72edb5d..97843aa 100644 --- a/tests/etc/Makefile.am +++ b/tests/etc/Makefile.am @@ -1,5 +1,5 @@ # This file is part of Wydawca -# Copyright (C) 2009-2011, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2011, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ endif gnupg: keygen.sh Makefile.am $(AM_V_GEN)$(SHELL) $(srcdir)/keygen.sh --gpg $(GPG) --homedir gnupg $(srcdir)/project -database.cf: dbgen.sh Makefile.am +database.cf: gnupg dbgen.sh Makefile.am $(AM_V_GEN)$(SHELL) $(srcdir)/dbgen.sh -o $@ \ --gpg $(GPG) --homedir gnupg $(srcdir)/project diff --git a/tests/etc/mailstats.cfin b/tests/etc/mailstats.cfin index c81da14..4295836 100644 --- a/tests/etc/mailstats.cfin +++ b/tests/etc/mailstats.cfin @@ -1,5 +1,5 @@ # This file is part of Wydawca testsuite -# Copyright (C) 2009-2011, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2011, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/etc/notify.cf b/tests/etc/notify.cf index 9e3a820..9643ccb 100644 --- a/tests/etc/notify.cf +++ b/tests/etc/notify.cf @@ -1,5 +1,5 @@ # This file is part of Wydawca testsuite -# Copyright (C) 2009-2011, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2011, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/inotify-ok.at b/tests/inotify-ok.at index 9058aca..a58a068 100644 --- a/tests/inotify-ok.at +++ b/tests/inotify-ok.at @@ -1,5 +1,5 @@ # Check distribution verification tests - success -*- Autotest -*- -# Copyright (C) 2010-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2010-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ AT_KEYWORDS([uploads check-test check-success check-ok inotify inotify-ok]) AT_WYDAWCA_INOTIFY_DAEMON( [spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } diff --git a/tests/inotify-rmsymlink.at b/tests/inotify-rmsymlink.at index e1addad..7ed03da 100644 --- a/tests/inotify-rmsymlink.at +++ b/tests/inotify-rmsymlink.at @@ -1,5 +1,5 @@ # Check symlink removal -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ AT_INOTIFY_PREREQ AT_SORT_PREREQ ], [spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } diff --git a/tests/inotify-symlink.at b/tests/inotify-symlink.at index c46176a..2b7f6d5 100644 --- a/tests/inotify-symlink.at +++ b/tests/inotify-symlink.at @@ -1,5 +1,5 @@ # Check symlink creation in daemon mode -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ AT_WYDAWCA_DAEMON([ AT_SORT_PREREQ AT_INOTIFY_PREREQ], [spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } @@ -69,4 +69,3 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) fini ]) AT_CLEANUP - diff --git a/tests/inotify-unatt00.at b/tests/inotify-unatt00.at index 18375c9..72a0720 100644 --- a/tests/inotify-unatt00.at +++ b/tests/inotify-unatt00.at @@ -1,5 +1,5 @@ # Check whether unattended upload is picked up -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ AT_KEYWORDS([inotify unattended pickup inotify-unatt00]) AT_WYDAWCA_INOTIFY_DAEMON( [spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } @@ -58,4 +58,3 @@ wydawca: [[INFO]] check failures: 0 wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished ]) AT_CLEANUP - diff --git a/tests/inotify-unatt01.at b/tests/inotify-unatt01.at index 2fff5f5..e8f7931 100644 --- a/tests/inotify-unatt01.at +++ b/tests/inotify-unatt01.at @@ -1,5 +1,5 @@ # Check whether unattended split upload is picked up -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ AT_KEYWORDS([inotify unattended pickup inotify-unatt01]) AT_WYDAWCA_INOTIFY_DAEMON( [spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } @@ -61,5 +61,3 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) fini ]) AT_CLEANUP - - diff --git a/tests/mailnotify.at b/tests/mailnotify.at index 18e8681..442daf1 100644 --- a/tests/mailnotify.at +++ b/tests/mailnotify.at @@ -1,5 +1,5 @@ # Check success notifications -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2023 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ AT_SETUP([Simple upload and notification]) AT_KEYWORDS([notify notify-upl]) AT_CHECK_UPLOAD([ module-prepend-load-path "$WY_MODDIR"; -module mailutils mod_mailutils.la; +module mailutils mod_mailutils.so; module-init mailutils { admin-address "root@localhost"; from-address "wydawca-noreply@localhost"; @@ -27,7 +27,7 @@ module-init mailutils { #include "$WY_CONFSRC/notify.cf" spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } diff --git a/tests/mailstats.at b/tests/mailstats.at index a758d43..302efa1 100644 --- a/tests/mailstats.at +++ b/tests/mailstats.at @@ -1,5 +1,5 @@ # Check mailing statistics -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2023 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ AT_SETUP([Mailing statistics]) AT_KEYWORDS([notify statistics mailstat]) AT_CHECK_UPLOAD([ module-prepend-load-path "$WY_MODDIR"; -module mailutils mod_mailutils.la; +module mailutils mod_mailutils.so; module-init mailutils { admin-address "root@localhost"; from-address "wydawca-noreply@localhost"; @@ -58,7 +58,7 @@ notify-event { } spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } diff --git a/tests/nullmail.c b/tests/nullmail.c index 0f40976..edc667e 100644 --- a/tests/nullmail.c +++ b/tests/nullmail.c @@ -1,5 +1,5 @@ /* wydawca - automatic release submission daemon - Copyright (C) 2007-2020 Sergey Poznyakoff + Copyright (C) 2007-2022 Sergey Poznyakoff Wydawca is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -94,4 +94,3 @@ main(int argc, char **argv) return 0; } - diff --git a/tests/rmsymlink00.at b/tests/rmsymlink00.at index 04d42c1..c098cff 100644 --- a/tests/rmsymlink00.at +++ b/tests/rmsymlink00.at @@ -1,5 +1,5 @@ # Check symlink removal -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ AT_KEYWORDS([symlink rmsymlink00]) AT_CHECK_UPLOAD([ spool test { - url ftp://wydawca.test; + url "ftp://wydawca.test"; source "$PWD/upload"; destination "$PWD/dest"; } @@ -62,4 +62,3 @@ wydawca: [[INFO]] check failures: 0 wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished ]) AT_CLEANUP - diff --git a/tests/spoolsrc.at b/tests/spoolsrc.at new file mode 100644 index 0000000..cc6ea18 --- /dev/null +++ b/tests/spoolsrc.at @@ -0,0 +1,45 @@ +# Check spool source directory checking -*- Autotest -*- +# Copyright (C) 2023 Sergey Poznyakoff +# +# Wydawca is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# Wydawca is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Wydawca. If not, see <http://www.gnu.org/licenses/>. +AT_SETUP([Spool source directory checking]) +AT_CHECK([ +cat > wydawca.conf <<EOF +spool up1 { + url "ftp://wydawca.1"; + source "$PWD/upload"; + destination "$PWD/dest.1"; +} + +spool up2 { + url "ftp://wydawca.2"; + source "$PWD/uplink"; + destination "$PWD/dest.2"; +} +EOF + +mkdir upload dest.1 dest.2 +ln -sf upload uplink + +wydawca --no-preproc --lint --config-file wydawca.conf 2>err +ec=$? +cat err|cwdrepl >&2 +exit $ec +], +[78], +[], +[wydawca: [[ERR]] wydawca.conf:7.1-11.1: cannot define spool up2: source directory ./uplink already in use by spool up1 +wydawca: [[ERR]] wydawca.conf:1.1-5.1: spool up1 defined here +]) +AT_CLEANUP diff --git a/tests/symlink00.at b/tests/symlink00.at index 76b7ad4..44c80f6 100644 --- a/tests/symlink00.at +++ b/tests/symlink00.at @@ -1,5 +1,5 @@ # Check symlink creation -*- Autotest -*- -# Copyright (C) 2009-2012, 2017, 2019-2020 Sergey Poznyakoff +# Copyright (C) 2009-2012, 2017, 2019-2022 Sergey Poznyakoff # # Wydawca is free software; you can redistribute it and/or modify # it under |