Untested backport to Ubuntu trusty.

* t/podcast.t: work around misidentification of Ogg Vorbis as Ogg Theora
  by allowing either.

diff --git a/debian/changelog b/debian/changelog
index 2fdfc0525649cc339ca0a8b063ff825a1815040b..6d15caad267abc46f9af77d1f675309ef45a7efd 100644 (file)
--- 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 <smcv@debian.org>  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 c698d1835d5de1fe8ed1345afb87ac3d71c34b0e..144e430e5d75b36b1193317c6eda3535b64da9c1 100755 (executable)
--- 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});