From d7d93c4047fda7d528b8ba3618d1d6b05ed49828 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 30 Nov 2015 17:33:00 +0000 Subject: [PATCH] Run autopkgtest tests using autodep8 and the pkg-perl team's infrastructure (cherry picked from commit cdfb4ab1a3c60bf699b8d77618ec9bdf526cdb35) --- debian/control | 1 + debian/tests/pkg-perl/smoke-env | 1 + debian/tests/pkg-perl/syntax-skip | 4 ++++ debian/tests/pkg-perl/use-name | 1 + t/basewiki_brokenlinks.t | 31 ++++++++++++++++++++--------- t/comments.t | 21 +++++++++++++++++--- t/conflicts.t | 19 ++++++++++++++++-- t/cvs.t | 2 ++ t/git.t | 10 +++++++++- t/permalink.t | 23 ++++++++++++++++++--- t/syntax.t | 2 ++ t/template_syntax.t | 2 ++ t/templates_documented.t | 6 +++++- t/trail.t | 33 ++++++++++++++++++++++--------- 14 files changed, 128 insertions(+), 28 deletions(-) create mode 100644 debian/tests/pkg-perl/smoke-env create mode 100644 debian/tests/pkg-perl/syntax-skip create mode 100644 debian/tests/pkg-perl/use-name diff --git a/debian/control b/debian/control index 05908cf23..fef9b10b0 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Uploaders: Josh Triplett Standards-Version: 3.9.3 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ +Testsuite: autopkgtest-pkg-perl Package: ikiwiki Architecture: all diff --git a/debian/tests/pkg-perl/smoke-env b/debian/tests/pkg-perl/smoke-env new file mode 100644 index 000000000..774738148 --- /dev/null +++ b/debian/tests/pkg-perl/smoke-env @@ -0,0 +1 @@ +INSTALLED_TESTS=1 diff --git a/debian/tests/pkg-perl/syntax-skip b/debian/tests/pkg-perl/syntax-skip new file mode 100644 index 000000000..404e431d3 --- /dev/null +++ b/debian/tests/pkg-perl/syntax-skip @@ -0,0 +1,4 @@ +IkiWiki/Plugin/amazon_s3.pm +IkiWiki/Plugin/cvs.pm +IkiWiki/Plugin/monotone.pm +IkiWiki/Plugin/po.pm diff --git a/debian/tests/pkg-perl/use-name b/debian/tests/pkg-perl/use-name new file mode 100644 index 000000000..3d60011b3 --- /dev/null +++ b/debian/tests/pkg-perl/use-name @@ -0,0 +1 @@ +IkiWiki diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t index 74ddc61c5..26e3859ab 100755 --- a/t/basewiki_brokenlinks.t +++ b/t/basewiki_brokenlinks.t @@ -1,21 +1,32 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More 'no_plan'; +use Test::More; + +my $installed = $ENV{INSTALLED_TESTS}; ok(! system("rm -rf t/tmp; mkdir t/tmp")); -ok(! system("make -s ikiwiki.out")); -ok(! system("make underlay_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null")); + +my @command; +if ($installed) { + @command = qw(env LC_ALL=C ikiwiki); +} +else { + ok(! system("make -s ikiwiki.out")); + ok(! system("make underlay_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null")); + @command = qw(env LC_ALL=C perl -I. ./ikiwiki.out + --underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki + --set underlaydirbase=t/tmp/install/usr/share/ikiwiki + --templatedir=templates); +} foreach my $plugin ("", "listdirectives") { - ok(! system("LC_ALL=C perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ". + ok(! system(@command, qw(--rebuild --plugin brokenlinks), # always enabled because pages link to it conditionally, # which brokenlinks cannot handle properly - "-plugin smiley ". - ($plugin ? "-plugin $plugin " : ""). - "-underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki ". - "-set underlaydirbase=t/tmp/install/usr/share/ikiwiki ". - "-templatedir=templates t/basewiki_brokenlinks t/tmp/out")); + qw(--plugin smiley), + ($plugin ? ("--plugin", $plugin) : ()), + qw(t/basewiki_brokenlinks t/tmp/out))); my $result=`grep 'no broken links' t/tmp/out/index.html`; ok(length($result)); if (! length $result) { @@ -27,3 +38,5 @@ foreach my $plugin ("", "listdirectives") { ok(! system("rm -rf t/tmp/out t/basewiki_brokenlinks/.ikiwiki")); } ok(! system("rm -rf t/tmp")); + +done_testing(); diff --git a/t/comments.t b/t/comments.t index da2148b6b..a5add9701 100755 --- a/t/comments.t +++ b/t/comments.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More 'no_plan'; +use Test::More; use IkiWiki; ok(! system("rm -rf t/tmp")); @@ -9,6 +9,20 @@ ok(mkdir "t/tmp"); ok(! system("cp -R t/tinyblog t/tmp/in")); ok(mkdir "t/tmp/in/post" or -d "t/tmp/in/post"); +my $installed = $ENV{INSTALLED_TESTS}; + +my @command; +if ($installed) { + @command = qw(ikiwiki); +} +else { + ok(! system("make -s ikiwiki.out")); + @command = qw(perl -I. ./ikiwiki.out + --underlaydir=underlays/basewiki + --set underlaydirbase=underlays + --templatedir=templates); +} + my $comment; $comment = < 106; +my $installed = $ENV{INSTALLED_TESTS}; + +my @command; +if ($installed) { + ok(1, "running installed"); + @command = qw(ikiwiki); +} +else { + ok(! system("make -s ikiwiki.out")); + @command = qw(perl -I. ./ikiwiki.out + --underlaydir=underlays/basewiki + --set underlaydirbase=underlays + --templatedir=templates); +} + # setup my $srcdir="t/tmp/src"; my $destdir="t/tmp/dest"; -ok(! system("make -s ikiwiki.out")); # runs ikiwiki to build test site sub runiki { my $testdesc=shift; - ok((! system("perl -I. ./ikiwiki.out -plugin txt -plugin rawhtml -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates $srcdir $destdir @_")), + ok((! system(@command, qw(--plugin txt --plugin rawhtml), + $srcdir, $destdir, @_)), $testdesc); } sub refreshiki { diff --git a/t/cvs.t b/t/cvs.t index 9afd5a7e9..f903d79b1 100755 --- a/t/cvs.t +++ b/t/cvs.t @@ -4,6 +4,8 @@ use strict; use Test::More; my $total_tests = 42; use IkiWiki; +my $installed = $ENV{INSTALLED_TESTS}; + my $default_test_methods = '^test_*'; my @required_programs = qw( cvs diff --git a/t/git.t b/t/git.t index 6d847dfb0..8e4e8eb65 100755 --- a/t/git.t +++ b/t/git.t @@ -26,8 +26,16 @@ $config{srcdir} = "$dir/src"; IkiWiki::loadplugins(); IkiWiki::checkconfig(); +my $makerepo; +if ($ENV{INSTALLED_TESTS}) { + $makerepo = "ikiwiki-makerepo"; +} +else { + $makerepo = "./ikiwiki-makerepo"; +} + ok (mkdir($config{srcdir})); -is (system("./ikiwiki-makerepo git $config{srcdir} $dir/repo"), 0); +is (system("$makerepo git $config{srcdir} $dir/repo"), 0); my @changes; @changes = IkiWiki::rcs_recentchanges(3); diff --git a/t/permalink.t b/t/permalink.t index 81d4d1820..f776dd260 100755 --- a/t/permalink.t +++ b/t/permalink.t @@ -1,13 +1,30 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More 'no_plan'; +use Test::More; + +my $installed = $ENV{INSTALLED_TESTS}; + +my @command; +if ($installed) { + @command = qw(ikiwiki); +} +else { + ok(! system("make -s ikiwiki.out")); + @command = qw(perl -I. ./ikiwiki.out + --underlaydir=underlays/basewiki + --set underlaydirbase=underlays + --templatedir=templates); +} ok(! system("mkdir t/tmp")); -ok(! system("make -s ikiwiki.out")); -ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates t/tinyblog t/tmp/out")); +ok(! system(@command, qw(--plugin inline --url=http://example.com + --cgiurl=http://example.com/ikiwiki.cgi --rss --atom + t/tinyblog t/tmp/out))); # This guid should never, ever change, for any reason whatsoever! my $guid="http://example.com/post/"; ok(length `egrep '$guid' t/tmp/out/index.rss`); ok(length `egrep '$guid' t/tmp/out/index.atom`); ok(! system("rm -rf t/tmp t/tinyblog/.ikiwiki")); + +done_testing(); diff --git a/t/syntax.t b/t/syntax.t index b7c6efd58..1d496be2d 100755 --- a/t/syntax.t +++ b/t/syntax.t @@ -3,6 +3,8 @@ use warnings; use strict; use Test::More; +plan(skip_all => 'running installed') if $ENV{INSTALLED_TESTS}; + my @progs="ikiwiki.in"; my @libs="IkiWiki.pm"; # monotone, external, amazon_s3, po, and cvs diff --git a/t/template_syntax.t b/t/template_syntax.t index 1e156eed8..661f450c0 100755 --- a/t/template_syntax.t +++ b/t/template_syntax.t @@ -3,6 +3,8 @@ use warnings; use strict; use Test::More; +plan(skip_all => 'running installed') if $ENV{INSTALLED_TESTS}; + my @templates=glob("templates/*.tmpl"), glob("doc/templates/*.mdwn"); plan(tests => 2*@templates); diff --git a/t/templates_documented.t b/t/templates_documented.t index 826c51d36..4991e4521 100755 --- a/t/templates_documented.t +++ b/t/templates_documented.t @@ -1,7 +1,9 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More 'no_plan'; +use Test::More; + +plan(skip_all => 'running installed') if $ENV{INSTALLED_TESTS}; $/=undef; open(IN, "doc/templates.mdwn") || die "doc/templates.mdwn: $!"; @@ -12,3 +14,5 @@ foreach my $file (glob("templates/*.tmpl")) { $file=~s/templates\///; ok($page =~ /\Q$file\E/, "$file documented on doc/templates.mdwn"); } + +done_testing(); diff --git a/t/trail.t b/t/trail.t index 2e4b9278d..53c5efb0b 100755 --- a/t/trail.t +++ b/t/trail.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More 'no_plan'; +use Test::More; use IkiWiki; sub check_trail { @@ -27,6 +27,24 @@ my $blob; ok(! system("rm -rf t/tmp")); ok(! system("mkdir t/tmp")); +my $installed = $ENV{INSTALLED_TESTS}; + +my @command; +if ($installed) { + @command = qw(ikiwiki); +} +else { + ok(! system("make -s ikiwiki.out")); + @command = qw(perl -I. ./ikiwiki.out + --underlaydir=underlays/basewiki + --set underlaydirbase=underlays + --templatedir=templates); +} + +push @command, qw(--set usedirs=0 --plugin trail --plugin inline + --url=http://example.com --cgiurl=http://example.com/ikiwiki.cgi + --rss --atom t/tmp/in t/tmp/out --verbose); + # Write files with a date in the past, so that when we refresh, # the update is detected. sub write_old_file { @@ -117,13 +135,8 @@ write_old_file("wind_in_the_willows.mdwn", <badger<\/a>/m); @@ -192,7 +205,7 @@ writefile("sorting.mdwn", "t/tmp/in", readfile("t/tmp/in/sorting.mdwn") . '[[!trailoptions sort="title" reverse="yes"]]'); -ok(! system("$command -refresh")); +ok(! system(@command, "--refresh")); check_trail("add/a.html", "n=add/b p="); check_trail("add/b.html", "n=add/c p=add/a"); @@ -219,3 +232,5 @@ check_trail("sorting/ancient.html", "n=sorting/z/a p=sorting/a/b"); check_trail("sorting/z/a.html", "n= p=sorting/ancient"); ok(! system("rm -rf t/tmp")); + +done_testing(); -- 2.39.2