From 200f34599ad806b2afcd74b6a2c6dfa847001252 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 6 May 2016 09:20:39 +0100 Subject: [PATCH] Untested backport to Ubuntu trusty. * t/podcast.t: work around misidentification of Ogg Vorbis as Ogg Theora by allowing either. --- debian/changelog | 8 ++++++++ t/podcast.t | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2fdfc0525..6d15caad2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ikiwiki (3.20160506~ppa1) trusty; urgency=medium + + * Untested backport to Ubuntu trusty. + * t/podcast.t: work around misidentification of Ogg Vorbis as Ogg Theora + by allowing either. + + -- Simon McVittie Fri, 06 May 2016 09:16:15 +0100 + ikiwiki (3.20160506) unstable; urgency=medium [ Simon McVittie ] diff --git a/t/podcast.t b/t/podcast.t index c698d1835..144e430e5 100755 --- a/t/podcast.t +++ b/t/podcast.t @@ -48,9 +48,9 @@ sub podcast { my %media_types = ( 'simplepost' => undef, - 'piano.mp3' => 'audio/mpeg', - 'scroll.3gp' => 'video/3gpp', - 'walter.ogg' => 'audio/ogg', + 'piano.mp3' => qr{^audio/mpeg$}s, + 'scroll.3gp' => qr{^video/3gpp$}s, + 'walter.ogg' => qr{^(audio/ogg|video/x-theora\+ogg)$}s, ); for my $format (qw(atom rss)) { @@ -90,7 +90,7 @@ sub podcast { qq{$format $title no body text}); is($enclosure->url, $url, qq{$format $title enclosure url}); - is($enclosure->type, $media_types{$title}, + like($enclosure->type, $media_types{$title}, qq{$format $title enclosure type}); cmp_ok($enclosure->length, '>', 0, qq{$format $title enclosure length}); @@ -109,7 +109,7 @@ sub podcast { isnt($enclosure, undef, qq{$format $title enclosure}); my $filename = basename($enclosure->url); - is($enclosure->type, $media_types{$filename}, + like($enclosure->type, $media_types{$filename}, qq{$format $title enclosure type}); cmp_ok($enclosure->length, '>', 0, qq{$format $title enclosure length}); -- 2.39.2