From 680c6eaa4e9ab37048476e42f8f38c8eb52a8c7f Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 00:15:42 +0000 Subject: [PATCH] Revert Gavin Garr's (gonzai's) commits to the test suite on 21st of July 2008 since they seem to be at least incomplete and caused the test suite to break badly: 01_templates.......error finding or loading blosxom plugin 'storydate': Can't locate storydate in @INC (@INC contains: /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../general /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../gavinc /etc/perl /usr/local/lib/perl/5.8.8 /usr/local/share/perl/5.8.8 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.8 /usr/share/perl/5.8 /usr/local/lib/site_perl .) at /home/abe/blosxom-devel/blosxom2/t/templates/../../blosxom.cgi line 318. error finding or loading blosxom plugin 'rss20': Can't locate rss20 in @INC (@INC contains: /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../general /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../gavinc /etc/perl /usr/local/lib/perl/5.8.8 /usr/local/share/perl/5.8.8 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.8 /usr/share/perl/5.8 /usr/local/lib/site_perl .) at /home/abe/blosxom-devel/blosxom2/t/templates/../../blosxom.cgi line 318. 01_templates.......ok 1/0error finding or loading blosxom plugin 'storydate': Can't locate storydate in @INC (@INC contains: /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../general /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../gavinc /etc/perl /usr/local/lib/perl/5.8.8 /usr/local/share/perl/5.8.8 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.8 /usr/share/perl/5.8 /usr/local/lib/site_perl .) at /home/abe/blosxom-devel/blosxom2/t/templates/../../blosxom.cgi line 318. error finding or loading blosxom plugin 'rss20': Can't locate rss20 in @INC (@INC contains: /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../general /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../gavinc /etc/perl /usr/local/lib/perl/5.8.8 /usr/local/share/perl/5.8.8 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.8 /usr/share/perl/5.8 /usr/local/lib/site_perl .) at /home/abe/blosxom-devel/blosxom2/t/templates/../../blosxom.cgi line 318. 01_templates.......NOK 2 The commits also include paths to locations outside the repository which made them look as if they weren't intended the way they happened. The missing plugins were probably located there. We can figure out what exactly went wrong after the 2.1.0 release. --- t/static_basic/config/blosxom.conf | 2 - t/static_basic/config/plugins.conf | 2 - t/static_basic/expected/2006/07/19/index.rss | 48 ++++++++------------ t/static_basic/expected/2006/07/index.rss | 48 ++++++++------------ t/static_basic/expected/2006/index.rss | 48 ++++++++------------ t/static_basic/expected/index.rss | 48 ++++++++------------ t/templates/config/blosxom.conf | 2 - t/templates/config/plugins.conf | 2 - t/templates/data/head.html | 5 +- t/templates/expected.html | 45 ++++++++++++++++++ t/templates/expected.rss | 34 ++++++++++++++ t/templates/spec.yaml | 11 +---- 12 files changed, 154 insertions(+), 141 deletions(-) create mode 100644 t/templates/expected.html create mode 100644 t/templates/expected.rss diff --git a/t/static_basic/config/blosxom.conf b/t/static_basic/config/blosxom.conf index 18ddf7a..7d8ef26 100644 --- a/t/static_basic/config/blosxom.conf +++ b/t/static_basic/config/blosxom.conf @@ -1,6 +1,4 @@ $datadir = "$ENV{BLOSXOM_CONFIG_DIR}/../data"; -$plugin_list = "$ENV{BLOSXOM_CONFIG_DIR}/plugins.conf"; -$plugin_path = "$ENV{BLOSXOM_CONFIG_DIR}/../../../general:$ENV{BLOSXOM_CONFIG_DIR}/../../../gavinc"; $static_dir = "$ENV{BLOSXOM_CONFIG_DIR}/../static"; $static_password = 'static'; @static_flavours = qw/html rss/; diff --git a/t/static_basic/config/plugins.conf b/t/static_basic/config/plugins.conf index d3be1b1..e69de29 100644 --- a/t/static_basic/config/plugins.conf +++ b/t/static_basic/config/plugins.conf @@ -1,2 +0,0 @@ -storydate -rss20 diff --git a/t/static_basic/expected/2006/07/19/index.rss b/t/static_basic/expected/2006/07/19/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/2006/07/19/index.rss +++ b/t/static_basic/expected/2006/07/19/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + 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. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/static_basic/expected/2006/07/index.rss b/t/static_basic/expected/2006/07/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/2006/07/index.rss +++ b/t/static_basic/expected/2006/07/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + 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. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/static_basic/expected/2006/index.rss b/t/static_basic/expected/2006/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/2006/index.rss +++ b/t/static_basic/expected/2006/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + 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. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/static_basic/expected/index.rss b/t/static_basic/expected/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/index.rss +++ b/t/static_basic/expected/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + 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. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/templates/config/blosxom.conf b/t/templates/config/blosxom.conf index 27d4b12..ae83e48 100644 --- a/t/templates/config/blosxom.conf +++ b/t/templates/config/blosxom.conf @@ -1,3 +1 @@ $datadir = "$ENV{BLOSXOM_CONFIG_DIR}/../data"; -$plugin_list = "$ENV{BLOSXOM_CONFIG_DIR}/plugins.conf"; -$plugin_path = "$ENV{BLOSXOM_CONFIG_DIR}/../../../general:$ENV{BLOSXOM_CONFIG_DIR}/../../../gavinc"; diff --git a/t/templates/config/plugins.conf b/t/templates/config/plugins.conf index d3be1b1..e69de29 100644 --- a/t/templates/config/plugins.conf +++ b/t/templates/config/plugins.conf @@ -1,2 +0,0 @@ -storydate -rss20 diff --git a/t/templates/data/head.html b/t/templates/data/head.html index 7426227..17c1753 100644 --- a/t/templates/data/head.html +++ b/t/templates/data/head.html @@ -2,9 +2,8 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - $blog_title $path_info_da $path_info_mo $path_info_yr - + + $blog_title $path_info_da $path_info_mo $path_info_yr

$blog_title

diff --git a/t/templates/expected.html b/t/templates/expected.html new file mode 100644 index 0000000..c068b57 --- /dev/null +++ b/t/templates/expected.html @@ -0,0 +1,45 @@ +Content-Type: text/xhtml; charset=UTF-8 + + + + + + My Weblog + + +

My Weblog

+

+

2007-11-11

+

Lorem ipsum II

+
+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. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor. +
+

posted at: 11:11 | path: /web | permanent link to this entry

+

2006-07-19

+

Lorem ipsum

+
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. + +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.Lorem ipsum dolor sit amet ipso facto. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym +ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas +cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon +ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer +tyr wuz de ramas cora dola tym ipso hor.
+

posted at: 22:54 | path: | permanent link to this entry

+ + + diff --git a/t/templates/expected.rss b/t/templates/expected.rss new file mode 100644 index 0000000..a03fc8a --- /dev/null +++ b/t/templates/expected.rss @@ -0,0 +1,34 @@ +Content-Type: text/xml; charset=ISO-8859-1 + + + + + + + + My Weblog + http://localhost/./blosxom.cgi + Yet another Blosxom weblog. + en + + + Lorem ipsum + http://localhost/./blosxom.cgi/2006/07/19#1 + 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. + +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.Lorem ipsum dolor sit amet ipso facto. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym +ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas +cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon +ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer +tyr wuz de ramas cora dola tym ipso hor. + + + diff --git a/t/templates/spec.yaml b/t/templates/spec.yaml index 167aadb..93883d3 100644 --- a/t/templates/spec.yaml +++ b/t/templates/spec.yaml @@ -1,13 +1,4 @@ tests: - - "" - - "expected/index.html" - - - - "path=/index.rss" - - "expected/index.rss" - - - - "path=/web/index.html" - - "expected/web/index.html" - - - - "path=/web/index.rss" - - "expected/web/index.rss" + - expected.html -- 2.30.2