diff --git a/setup.py b/setup.py index c249e50..e4f72b1 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ install_requires = [ tests_require = [ 'coveralls', - 'pytest', + 'pytest>=3.1.0', # Pinned for the ``pytest.param`` method 'coverage', 'mock', 'pylint', diff --git a/tests/cassettes/test_parser[vidme_video].yaml b/tests/cassettes/test_parser[vidme_video].yaml index da7bc70..246116f 100644 --- a/tests/cassettes/test_parser[vidme_video].yaml +++ b/tests/cassettes/test_parser[vidme_video].yaml @@ -11,33 +11,33 @@ interactions: response: body: string: !!binary | - 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 headers: Access-Control-Allow-Credentials: ['false'] Access-Control-Allow-Headers: ['DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Content-Length,Authorization,AccessToken'] @@ -47,16 +47,16 @@ interactions: Connection: [keep-alive] Content-Encoding: [gzip] Content-Type: [application/json] - Date: ['Thu, 14 Sep 2017 04:47:05 GMT'] + Date: ['Thu, 14 Sep 2017 16:54:49 GMT'] Server: [nginx] - Set-Cookie: ['rid=d2020001811542678198465f9bf37474; expires=Sat, 17-May-2031 - 01:48:34 GMT; Max-Age=431384489; path=/; domain=vid.me', 'srid=KnCbWl7VQ8aNcKiSoVSvjw-wAdPVQ-8gYEX1fa532CskjGNFv31yLzoI; - expires=Sat, 17-May-2031 01:48:34 GMT; Max-Age=431384489; path=/; domain=vid.me'] + Set-Cookie: ['rid=dd37f6b997a84f26ab86df858263ef7a; expires=Sat, 17-May-2031 + 01:48:34 GMT; Max-Age=431340825; path=/; domain=vid.me', 'srid=dCtP8tz0QcaRsg2Lye6v2A-fgc3WA-K6JNQ2c693ma5ujlvxYprRt9Y; + expires=Sat, 17-May-2031 01:48:34 GMT; Max-Age=431340825; path=/; domain=vid.me'] Strict-Transport-Security: [max-age=31536000; includeSubDomains; preload] Vary: [Accept-Encoding] - X-Request-Time: ['33'] + X-Request-Time: ['45'] X-Vidme-Authorization-Okay: ['false'] - X-Vidme-Request-Id: [19c017370f624130822806cf2d31ef29] - X-Vidme-Server-Id: [774cabf0c03abedc3aa54f24e0e4275e] + X-Vidme-Request-Id: [ab765e9c4d134fe891f4b56d85fe61c0] + X-Vidme-Server-Id: [cc459e58c1079287e8d2d611a1af2450] status: {code: 200, message: OK} version: 1 diff --git a/tests/test_mime_parsers.py b/tests/test_mime_parsers.py index 0781942..ce09907 100644 --- a/tests/test_mime_parsers.py +++ b/tests/test_mime_parsers.py @@ -65,13 +65,14 @@ URLS = OrderedDict([ 'https://streamable.com/vkc0y', re.compile('https://(.*)\.streamablevideo\.com/video/mp4/(.*)\.mp4(.*)'), 'video/mp4')), - ('vidme_video', ( + ('vidme_video', pytest.param( 'https://vid.me/rHlb', re.compile('https://(.*)\.cloudfront\.net/videos/15694926/52450725.mp4(.*)'), - 'video/mp4')), + 'video/mp4', + marks=pytest.mark.xfail(reason="vidme API appears to have changed format"))), ('liveleak_video', ( 'https://www.liveleak.com/view?i=08b_1499296574', - re.compile('https://cdn.liveleak.com/80281E/ll_a_s/2017/Jul/5/LiveLeak-dot-com-08b_1499296574-NMHH8690_1499296571.mov.h264_720p.mp4(.*)'), + re.compile('https://cdn.liveleak.com/(.*).mp4(.*)'), 'video/mp4')), ('reddit_gif', ( 'https://v.redd.it/wkm9zol8c6fz',