Fix minor errors with t/static_basic unit tests.

diff --git a/t/driver b/t/driver
index 52fc128f36725c8f67270a7491d5ecf7fd10ebaa..c1e9a555064d26b8ae8fc1d6138d7c53fbd849df 100644 (file)
--- a/t/driver
+++ b/t/driver
@@ -69,7 +69,8 @@ if ($static_password) {
     skip "Static tests require 'expected' directory", 1 unless $expected;
     $expected = "$blosxom_config_dir/../$expected" unless $expected =~ m!^/!;
     skip "Static tests 'expected' directory is missing", 1 unless -d $expected;
-    skip "Static tests 'static_dir' directory is missing", 1 unless -d $static_dir;
+    -d $static_dir or mkdir $static_dir
+      or die "mkdir on static_dir '$static_dir' failed: $!";
 
     File::Remove::remove(\1, "$static_dir/*");
 
@@ -80,7 +81,7 @@ if ($static_password) {
       my ($a_short, $b_short) = ($a, $b);
       $a_short =~ s!^.*\.\./!! if $a_short;
       $b_short =~ s!^.*\.\./!! if $b_short;
-      return if $b =~ m! /CVS$ !x;
+      return if $b && $b =~ m! /CVS$ !x;
       if (! $b) {
         fail("$a_short has no corresponding file");
       } elsif (! $a) {

diff --git a/t/static_basic/expected/2006/07/19/index.rss b/t/static_basic/expected/2006/07/19/index.rss
index 4d9eb5b8a7c3d60fb62a63556a680002c66c8cd7..073abbeed1ca46746a3a2e4ff91abd08ec70bdc3 100644 (file)
--- a/t/static_basic/expected/2006/07/19/index.rss
+++ b/t/static_basic/expected/2006/07/19/index.rss
@@ -6,14 +6,14 @@
     <description>Yet another Blosxom weblog.</description>
     <language>en</language>
     <docs>http://blogs.law.harvard.edu/tech/rss</docs>
-    <generator>blosxom/2.1.0</generator>
+    <generator>blosxom/2.1.2+dev</generator>
 
   <item>
     <title>Lorem ipsum</title>
     <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
     <link>http://localhost/2006/07/19#1</link>
     <category></category>
-    <guid isPermaLink="false">/1</guid>
+    <guid isPermaLink="false">http://localhost/1</guid>
     <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
 amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 

diff --git a/t/static_basic/expected/2006/07/index.rss b/t/static_basic/expected/2006/07/index.rss
index 4d9eb5b8a7c3d60fb62a63556a680002c66c8cd7..073abbeed1ca46746a3a2e4ff91abd08ec70bdc3 100644 (file)
--- a/t/static_basic/expected/2006/07/index.rss
+++ b/t/static_basic/expected/2006/07/index.rss
@@ -6,14 +6,14 @@
     <description>Yet another Blosxom weblog.</description>
     <language>en</language>
     <docs>http://blogs.law.harvard.edu/tech/rss</docs>
-    <generator>blosxom/2.1.0</generator>
+    <generator>blosxom/2.1.2+dev</generator>
 
   <item>
     <title>Lorem ipsum</title>
     <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
     <link>http://localhost/2006/07/19#1</link>
     <category></category>
-    <guid isPermaLink="false">/1</guid>
+    <guid isPermaLink="false">http://localhost/1</guid>
     <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
 amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 

diff --git a/t/static_basic/expected/2006/index.rss b/t/static_basic/expected/2006/index.rss
index 4d9eb5b8a7c3d60fb62a63556a680002c66c8cd7..073abbeed1ca46746a3a2e4ff91abd08ec70bdc3 100644 (file)
--- a/t/static_basic/expected/2006/index.rss
+++ b/t/static_basic/expected/2006/index.rss
@@ -6,14 +6,14 @@
     <description>Yet another Blosxom weblog.</description>
     <language>en</language>
     <docs>http://blogs.law.harvard.edu/tech/rss</docs>
-    <generator>blosxom/2.1.0</generator>
+    <generator>blosxom/2.1.2+dev</generator>
 
   <item>
     <title>Lorem ipsum</title>
     <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
     <link>http://localhost/2006/07/19#1</link>
     <category></category>
-    <guid isPermaLink="false">/1</guid>
+    <guid isPermaLink="false">http://localhost/1</guid>
     <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
 amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 

diff --git a/t/static_basic/expected/index.rss b/t/static_basic/expected/index.rss
index 4d9eb5b8a7c3d60fb62a63556a680002c66c8cd7..073abbeed1ca46746a3a2e4ff91abd08ec70bdc3 100644 (file)
--- a/t/static_basic/expected/index.rss
+++ b/t/static_basic/expected/index.rss
@@ -6,14 +6,14 @@
     <description>Yet another Blosxom weblog.</description>
     <language>en</language>
     <docs>http://blogs.law.harvard.edu/tech/rss</docs>
-    <generator>blosxom/2.1.0</generator>
+    <generator>blosxom/2.1.2+dev</generator>
 
   <item>
     <title>Lorem ipsum</title>
     <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
     <link>http://localhost/2006/07/19#1</link>
     <category></category>
-    <guid isPermaLink="false">/1</guid>
+    <guid isPermaLink="false">http://localhost/1</guid>
     <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
 amet ipso facto.Lorem ipsum dolor sit amet ipso facto.