Response to jsewell's bug report.

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

diff --git a/t/bazaar.t b/t/bazaar.t
index 0bdd883d51e754d587d4a92e37d34c67b97621bf..6e58f48f1c4e6183ea6a03d8c194317e5b2f2759 100755 (executable)
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -6,11 +6,14 @@ BEGIN {
        $dir = "/tmp/ikiwiki-test-bzr.$$";
        my $bzr=`which bzr`;
        chomp $bzr;
        $dir = "/tmp/ikiwiki-test-bzr.$$";
        my $bzr=`which bzr`;
        chomp $bzr;

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

                eval q{
                eval q{

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

                }
        }
                }
        }

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

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


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

+# XXX
+# This is a workaround for bzr's new requirement that bzr whoami be run
+# before committing. This makes the test suite work with an unconfigured
+# bzr, but ignores the need to have a properly configured bzr before
+# using ikiwiki with bzr.
+$ENV{HOME}=$dir;
+system 'bzr whoami test@example.com';
+

 system "bzr init $config{srcdir}";
 
 system "bzr init $config{srcdir}";
 

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

 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
 # 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);


@@ -66,7 +85,10 @@ ok($mtime >= time() - 20);
 writefile('test3.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test3.mdwn");
 IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn");
 writefile('test3.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test3.mdwn");
 IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn");

-IkiWiki::rcs_commit_staged("Added the 4th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(
+       message => "Added the 4th page",
+       session => $session,
+);

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


@@ -75,7 +97,10 @@ is($changes[0]{pages}[0]{"page"}, "test4");
 
 ok(mkdir($config{srcdir}."/newdir"));
 IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn");
 
 ok(mkdir($config{srcdir}."/newdir"));
 IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn");

-IkiWiki::rcs_commit_staged("Added the 5th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(
+       message => "Added the 5th page",
+       session => $session,
+);

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


@@ -83,6 +108,9 @@ is($#changes, 3);
 is($changes[0]{pages}[0]{"page"}, "newdir/test5");
 
 IkiWiki::rcs_remove("newdir/test5.mdwn");
 is($changes[0]{pages}[0]{"page"}, "newdir/test5");
 
 IkiWiki::rcs_remove("newdir/test5.mdwn");

-IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(
+       message => "Remove the 5th page",
+       session => $session,
+);

 
 system "rm -rf $dir";
 
 system "rm -rf $dir";