textile-double-escape-bug.t: tolerate any valid encoding

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

diff --git a/t/mercurial.t b/t/mercurial.t
index 954b17526bd31c987fa21a0c77fa64e98b4d3139..4918fc76e9a0bb37adecc18ecbf47cc1eba1a795 100755 (executable)
--- a/t/mercurial.t
+++ b/t/mercurial.t
@@ -6,11 +6,14 @@ BEGIN {
        $dir = "/tmp/ikiwiki-test-hg.$$";
        my $hg=`which hg`;
        chomp $hg;
        $dir = "/tmp/ikiwiki-test-hg.$$";
        my $hg=`which hg`;
        chomp $hg;

-       if (! -x $hg || ! mkdir($dir)) {
+       if (! -x $hg) {

                eval q{
                eval q{

-                       use Test::More skip_all => "hg not available or could not make test dir"
+                       use Test::More skip_all => "hg not available"

                }
        }
                }
        }

+       if (! mkdir($dir)) {
+               die $@;
+       }

 }
 use Test::More tests => 11;
 
 }
 use Test::More tests => 11;
 


@@ -22,13 +25,22 @@ $config{srcdir} = "$dir/repo";
 IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 
 IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 

+use CGI::Session;
+my $session=CGI::Session->new;
+$session->param("name", "Joe User");
+

 system "hg init $config{srcdir}";
 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
 system "hg init $config{srcdir}";
 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");

-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo", "Joe User");
+IkiWiki::rcs_commit(
+       file => "test1.mdwn",
+       message => "Added the first page",
+       token => "moo",
+       session => $session,
+);

 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);