From d3f00cdbc6c6d760edb202a1bf637305929f512d Mon Sep 17 00:00:00 2001
From: Michael Lazar <lazar.michael22@gmail.com>
Date: Thu, 21 Jul 2016 00:40:51 -0700
Subject: [PATCH] Added parameter ids to tests.

---
 tests/test_mime_parsers.py | 73 ++++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 26 deletions(-)

diff --git a/tests/test_mime_parsers.py b/tests/test_mime_parsers.py
index 47bd04e..355d60f 100644
--- a/tests/test_mime_parsers.py
+++ b/tests/test_mime_parsers.py
@@ -5,35 +5,56 @@ import pytest
 
 from rtv.mime_parsers import parsers
 
-URLS = [
-    ('http://www.example.com/i/image.png',
-     'http://www.example.com/i/image.png', 'image/png'),
-    ('http://www.example.com/v/video.mpeg',
-     'http://www.example.com/v/video.mpeg', 'video/mpeg'),
-    ('http://www.example.com/i/image',
-     'http://www.example.com/i/image', None),
-    ('https://gfycat.com/DeliciousUnfortunateAdouri',
-     'https://giant.gfycat.com/DeliciousUnfortunateAdouri.webm', 'video/webm'),
-    ('https://www.youtube.com/watch?v=FjNdYp2gXRY',
-     'https://www.youtube.com/watch?v=FjNdYp2gXRY', 'video/x-youtube'),
-    ('http://i.imgur.com/i/image.gifv',
-     'http://i.imgur.com/i/image.mp4', 'video/mp4'),
-    ('https://i.reddituploads.com/a065472e47a4405da159189ee48bff46?fit=max&h='
-     '1536&w=1536&s=5639918a0c696b9bb3ec694dc3cf59ac',
-     'https://i.reddituploads.com/a065472e47a4405da159189ee48bff46?fit=max&h='
-     '1536&w=1536&s=5639918a0c696b9bb3ec694dc3cf59ac', 'image/jpeg'),
-    ('http://imgur.com/yW0kbMi',
-     'https://i.imgur.com/yW0kbMi.jpg', 'image/jpeg'),
-    ('http://imgur.com/yjP1v4B',
-     'https://i.imgur.com/yjP1v4Bh.jpg', 'image/jpeg'),
-    ('http://imgur.com/a/qx9t5',
-     'http://i.imgur.com/uEt0YLI.jpg', 'image/x-imgur-album'),
-]
+ARGS = 'url,modified_url,mime_type'
+URLS = {
+    'simple_png': (
+        'http://www.example.com/i/image.png',
+        'http://www.example.com/i/image.png',
+        'image/png'),
+    'simple_mpeg': (
+        'http://www.example.com/v/video.mpeg',
+        'http://www.example.com/v/video.mpeg',
+        'video/mpeg'),
+    'simple_unknown': (
+        'http://www.example.com/i/image',
+        'http://www.example.com/i/image',
+        None),
+    'gfycat': (
+        'https://gfycat.com/DeliciousUnfortunateAdouri',
+        'https://giant.gfycat.com/DeliciousUnfortunateAdouri.webm',
+        'video/webm'),
+    'youtube': (
+        'https://www.youtube.com/watch?v=FjNdYp2gXRY',
+        'https://www.youtube.com/watch?v=FjNdYp2gXRY',
+        'video/x-youtube'),
+    'gifv': (
+        'http://i.imgur.com/i/image.gifv',
+        'http://i.imgur.com/i/image.mp4',
+        'video/mp4'),
+    'reddit_uploads': (
+        'https://i.reddituploads.com/a065472e47a4405da159189ee48bff46?fit=max'
+        '&h=1536&w=1536&s=5639918a0c696b9bb3ec694dc3cf59ac',
+        'https://i.reddituploads.com/a065472e47a4405da159189ee48bff46?fit=max'
+        '&h=1536&w=1536&s=5639918a0c696b9bb3ec694dc3cf59ac',
+        'image/jpeg'),
+    'imgur_1': (
+        'http://imgur.com/yW0kbMi',
+        'https://i.imgur.com/yW0kbMi.jpg',
+        'image/jpeg'),
+    'imgur_2': (
+        'http://imgur.com/yjP1v4B',
+        'https://i.imgur.com/yjP1v4Bh.jpg',
+        'image/jpeg'),
+    'imgur_album': (
+        'http://imgur.com/a/qx9t5',
+        'http://i.imgur.com/uEt0YLI.jpg',
+        'image/x-imgur-album'),
+}
 
 
-@pytest.mark.parametrize('url,modified_url,mime_type', URLS)
+@pytest.mark.parametrize(ARGS, URLS.values(), ids=URLS.keys())
 def test_parser(url, modified_url, mime_type, reddit):
-    # Add the reddit fixture so the cassettes get generated
+    # Include the reddit fixture so the cassettes get generated
 
     for parser in parsers:
         if parser.pattern.match(url):