Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 17 Mar 2011 21:09:39 +0000 (17:09 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 17 Mar 2011 21:09:39 +0000 (17:09 -0400)
t/autoindex.t
t/tag.t

index b38be83138e2709b68041acfeb17ae1ccb0c3eec..d16e44ca8ebca7a14f5d3bcc601b6add1aeae47d 100755 (executable)
@@ -75,8 +75,8 @@ is($autofiles{"deleted.mdwn"}{plugin}, "autoindex");
 %pages = ();
 @del = ();
 IkiWiki::gen_autofile("deleted.mdwn", \%pages, \@del);
-is_deeply(\%pages, {}) || diag explain \%pages;
-is_deeply(\@del, []) || diag explain \@del;
+is_deeply(\%pages, {});
+is_deeply(\@del, []);
 ok(! -f "t/tmp/deleted.mdwn");
 
 # this page is tried as an autofile, but because it'll be in @del, it's not
@@ -86,8 +86,8 @@ ok(! exists $wikistate{autoindex}{autofile}{"gone.mdwn"});
 @del = ("gone.mdwn");
 is($autofiles{"gone.mdwn"}{plugin}, "autoindex");
 IkiWiki::gen_autofile("gone.mdwn", \%pages, \@del);
-is_deeply(\%pages, {}) || diag explain \%pages;
-is_deeply(\@del, ["gone.mdwn"]) || diag explain \@del;
+is_deeply(\%pages, {});
+is_deeply(\@del, ["gone.mdwn"]);
 ok(! -f "t/tmp/gone.mdwn");
 
 # this page does not exist and has no reason to be re-created, but we no longer
@@ -116,8 +116,8 @@ ok(! exists $wikistate{autoindex}{autofile}{"tags.mdwn"});
 @del = ();
 is($autofiles{"tags.mdwn"}{plugin}, "autoindex");
 IkiWiki::gen_autofile("tags.mdwn", \%pages, \@del);
-is_deeply(\%pages, {"t/tmp/tags" => 1}) || diag explain \%pages;
-is_deeply(\@del, []) || diag explain \@del;
+is_deeply(\%pages, {"t/tmp/tags" => 1});
+is_deeply(\@del, []);
 ok(! -s "t/tmp/tags.mdwn");
 ok(-s "t/tmp/.ikiwiki/transient/tags.mdwn");
 
@@ -127,8 +127,8 @@ ok(! exists $wikistate{autoindex}{autofile}{"attached.mdwn"});
 @del = ();
 is($autofiles{"attached.mdwn"}{plugin}, "autoindex");
 IkiWiki::gen_autofile("attached.mdwn", \%pages, \@del);
-is_deeply(\%pages, {"t/tmp/attached" => 1}) || diag explain \%pages;
-is_deeply(\@del, []) || diag explain \@del;
+is_deeply(\%pages, {"t/tmp/attached" => 1});
+is_deeply(\@del, []);
 ok(-s "t/tmp/.ikiwiki/transient/attached.mdwn");
 
 1;
diff --git a/t/tag.t b/t/tag.t
index 8fc4940a2b5a67a871c7d4925a5d77eaec2aba44..cc0a30cadf481c6d0d9be8ad431e67d05f84790e 100755 (executable)
--- a/t/tag.t
+++ b/t/tag.t
@@ -65,8 +65,8 @@ my (%pages, @del);
 IkiWiki::gen_autofile("tags/lucky.mdwn", \%pages, \@del);
 ok(! -s "t/tmp/tags/lucky.mdwn");
 ok(-s "t/tmp/.ikiwiki/transient/tags/lucky.mdwn");
-is_deeply(\%pages, {"t/tmp/tags/lucky" => 1}) || diag explain \%pages;
-is_deeply(\@del, []) || diag explain \@del;
+is_deeply(\%pages, {"t/tmp/tags/lucky" => 1});
+is_deeply(\@del, []);
 
 # generating an autofile that already exists does nothing
 %pages = @del = ();