X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/bd7221ae5450e14e9641e01e0c2890a8f018ddb4..c635611232130bef9a66b7ad9734ba5f0523d4c2:/t/bazaar.t

diff --git a/t/bazaar.t b/t/bazaar.t
index 3e54ec4dc..6e58f48f1 100755
--- 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;