Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / t / cvs.t

diff --git a/t/cvs.t b/t/cvs.t
index 2f9056b4541c23dc2ef93de9e49660682cfe09e6..6acafd701fe39f29ea3732983784439c929eefad 100755 (executable)
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -1,9 +1,11 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

-use Test::More; my $total_tests = 69;
+use Test::More; my $total_tests = 72;

 use IkiWiki;
 
 use IkiWiki;
 

+my $installed = $ENV{INSTALLED_TESTS};
+

 my $default_test_methods = '^test_*';
 my @required_programs = qw(
        cvs
 my $default_test_methods = '^test_*';
 my @required_programs = qw(
        cvs


@@ -33,12 +35,7 @@ sub test_web_comments {
 }
 
 sub test_chdir_magic {
 }
 
 sub test_chdir_magic {

-       # cvs.pm operations are always occurring inside $config{srcdir}
-       # other ikiwiki operations are occurring wherever, and are unaffected

        # when are we bothering with "local $CWD" and when aren't we?
        # when are we bothering with "local $CWD" and when aren't we?

-       # after commit, presumably only with post-commit hook enabled:
-       #> Use of chdir('') or chdir(undef) as chdir() is deprecated at
-       #> /usr/pkg/lib/perl5/vendor_perl/5.14.0/File/chdir.pm line 45.

 }
 
 sub test_cvs_info {
 }
 
 sub test_cvs_info {


@@ -178,7 +175,6 @@ sub test_rcs_commit {
        # - else, revert + return content with the conflict markers in it
        # git.pm receives "session" param -- useful here?
        # web commits start with "web commit {by,from} "
        # - else, revert + return content with the conflict markers in it
        # git.pm receives "session" param -- useful here?
        # web commits start with "web commit {by,from} "

-       # seeing File::chdir errors on commit?

 
        # XXX commit can fail due to "could not open lock file"
 }
 
        # XXX commit can fail due to "could not open lock file"
 }


@@ -199,9 +195,16 @@ sub test_rcs_add {
        is_in_keyword_substitution_mode($file, q{-kkv});
        like(
                readfile($config{srcdir} . "/$file"),
        is_in_keyword_substitution_mode($file, q{-kkv});
        like(
                readfile($config{srcdir} . "/$file"),

-               qr/^# \$Id: $file,v 1.1 .+\$$/m,
+               qr/^# \$Id: $file,v 1\.1 .+\$$/m,

                q{can expand RCS Id keyword},
        );
                q{can expand RCS Id keyword},
        );

+       my $generated_file = $config{destdir} . q{/test0/index.html};
+       ok(-e $generated_file, q{post-commit hook generates content});
+       like(
+               readfile($generated_file),
+               qr/^<h1>\$Id: $file,v 1\.1 .+\$<\/h1>$/m,
+               q{can htmlize mdwn, including RCS Id},
+       );

        @changes = IkiWiki::rcs_recentchanges(3);
        is_total_number_of_changes(\@changes, 1);
        is_most_recent_change(\@changes, stripext($file), $message);
        @changes = IkiWiki::rcs_recentchanges(3);
        is_total_number_of_changes(\@changes, 1);
        is_most_recent_change(\@changes, stripext($file), $message);


@@ -276,9 +279,9 @@ sub test_rcs_add {
        $message = "remove the UTF-8 and binary files we just added";
        IkiWiki::rcs_remove($_) for ($file1, $file2);
        IkiWiki::rcs_commit_staged(message => $message);
        $message = "remove the UTF-8 and binary files we just added";
        IkiWiki::rcs_remove($_) for ($file1, $file2);
        IkiWiki::rcs_commit_staged(message => $message);

-       ok(-d "$config{srcdir}/test8", q{empty dir not pruned (1)});
+       ok(! -d "$config{srcdir}/test8", q{empty dir pruned by post-commit});
+       ok(! -d "$config{srcdir}/test10", q{empty dir pruned by post-commit});

        @changes = IkiWiki::rcs_recentchanges(11);
        @changes = IkiWiki::rcs_recentchanges(11);

-       ok(-d "$config{srcdir}/test8", q{empty dir not pruned (2)});

        is_total_number_of_changes(\@changes, 5);
        # XXX test for both files in the commit, and no other files
        is_most_recent_change(\@changes, $file2, $message);
        is_total_number_of_changes(\@changes, 5);
        # XXX test for both files in the commit, and no other files
        is_most_recent_change(\@changes, $file2, $message);


@@ -387,6 +390,12 @@ sub test_rcs_diff {
        @changes = IkiWiki::rcs_recentchanges(3);
        is_total_number_of_changes(\@changes, 1);
 
        @changes = IkiWiki::rcs_recentchanges(3);
        is_total_number_of_changes(\@changes, 1);
 

+       unlike(
+               $changes[0]->{pages}->[0]->{diffurl},
+               qr/%2F/m,
+               q{path separators are preserved when UTF-8scaping filename},
+       );
+

        my $changeset = 1;
 
        my $maxlines = undef;
        my $changeset = 1;
 
        my $maxlines = undef;


@@ -531,6 +540,7 @@ sub list_module {
 sub _startup {
        my $can_plan = shift;
        _plan_for_test_more($can_plan);
 sub _startup {
        my $can_plan = shift;
        _plan_for_test_more($can_plan);

+       hook(type => "genwrapper", id => "cvstest", call => \&_wrapper_paths);

        _generate_test_config();
 }
 
        _generate_test_config();
 }
 


@@ -566,8 +576,12 @@ sub _generate_test_config {
        %config = IkiWiki::defaultconfig();
        $config{rcs} = "cvs";
        $config{srcdir} = "$dir/src";
        %config = IkiWiki::defaultconfig();
        $config{rcs} = "cvs";
        $config{srcdir} = "$dir/src";

+       $config{allow_symlinks_before_srcdir} = 1;
+       $config{destdir} = "$dir/dest";

        $config{cvsrepo} = "$dir/repo";
        $config{cvspath} = "ikiwiki";
        $config{cvsrepo} = "$dir/repo";
        $config{cvspath} = "ikiwiki";

+       use Cwd; $config{templatedir} = getcwd() . '/templates';
+       $config{diffurl} = "/nonexistent/cvsweb/[[file]]";

        IkiWiki::loadplugins();
        IkiWiki::checkconfig();
 }
        IkiWiki::loadplugins();
        IkiWiki::checkconfig();
 }


@@ -578,12 +592,41 @@ sub _generate_test_repo {
 
        my $cvs = "cvs -d $config{cvsrepo}";
        my $dn = ">/dev/null";
 
        my $cvs = "cvs -d $config{cvsrepo}";
        my $dn = ">/dev/null";

+

        system "$cvs init $dn";
        system "mkdir $dir/$config{cvspath} $dn";
        system "cd $dir/$config{cvspath} && "
                . "$cvs import -m import $config{cvspath} VENDOR RELEASE $dn";
        system "rm -rf $dir/$config{cvspath} $dn";
        system "$cvs co -d $config{srcdir} $config{cvspath} $dn";
        system "$cvs init $dn";
        system "mkdir $dir/$config{cvspath} $dn";
        system "cd $dir/$config{cvspath} && "
                . "$cvs import -m import $config{cvspath} VENDOR RELEASE $dn";
        system "rm -rf $dir/$config{cvspath} $dn";
        system "$cvs co -d $config{srcdir} $config{cvspath} $dn";

+
+       _generate_and_configure_post_commit_hook();
+}
+
+sub _generate_and_configure_post_commit_hook {
+       $config{cvs_wrapper} = $config{cvsrepo} . "/CVSROOT/test-post";
+       $config{wrapper} = $config{cvs_wrapper};
+
+       require IkiWiki::Wrapper;
+       if ($installed) {
+               $IkiWiki::program_to_wrap = `which ikiwiki`;
+       }
+       else {
+               $IkiWiki::program_to_wrap = './ikiwiki.out';
+       }
+       # XXX substitute its interpreter to Makefile's $(PERL)
+       # XXX best solution: do this to all scripts during build
+       IkiWiki::gen_wrapper();
+
+       my $cvs = "cvs -d $config{cvsrepo}";
+       my $dn = ">/dev/null";
+
+       system "mkdir $config{destdir} $dn";
+       system "cd $dir && $cvs co CVSROOT $dn && cd CVSROOT && " .
+               "echo 'DEFAULT $config{cvsrepo}/CVSROOT/test-post %{sVv} &' "
+               . " >> loginfo && "
+               . "$cvs commit -m 'test repo setup' $dn && "
+               . "cd .. && rm -rf CVSROOT";

 }
 
 sub add_and_commit {
 }
 
 sub add_and_commit {


@@ -663,3 +706,7 @@ sub stripext {
        $file =~ s|$extension$||g;
        return $file;
 }
        $file =~ s|$extension$||g;
        return $file;
 }

+
+sub _wrapper_paths {
+       return qq{addenv("PERL5LIB", "$ENV{PERL5LIB}");};
+}