t/bazaar.t: Work around bzr 2.2.0's new requirement to configure bzr whoami before...

diff --git a/debian/changelog b/debian/changelog
index 53cff2970e6ccd0e62a1279423e8ca96b861f46d..df74e35d1fb11f1d6bcae7605c61d179ba428087 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
     (intrigeri:)
   * po: Fix some bugs that affected l10n.ikiwiki.info's unusual
     setup. (intrigeri)
     (intrigeri:)
   * po: Fix some bugs that affected l10n.ikiwiki.info's unusual
     setup. (intrigeri)

+  * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure
+    bzr whoami before committing.

 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
 

diff --git a/t/bazaar.t b/t/bazaar.t
index cd840fbe1b39d2d48340430da718e1e8788d5c79..6e58f48f1c4e6183ea6a03d8c194317e5b2f2759 100755 (executable)
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -25,6 +25,14 @@ $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}";
 
 use CGI::Session;
 system "bzr init $config{srcdir}";
 
 use CGI::Session;