Rebuild for jessie-backports

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

diff --git a/t/bazaar.t b/t/bazaar.t
index 3e54ec4dc8f57ee7601f572d090a5dd66f04a822..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;
-       if (! -x $bzr || ! mkdir($dir)) {
+       if (! -x $bzr) {
                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;
 
@@ -22,6 +25,14 @@ $config{srcdir} = "$dir/repo";
 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}";
 
 use CGI::Session;