From 1532d1b69050cb34e4183e6a5538c5493408e3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Mon, 8 Oct 2018 23:30:06 +0200
Subject: [PATCH] fix 'range' tests and update a few test results

---
 gallery_dl/extractor/deviantart.py   | 4 ++--
 gallery_dl/extractor/fallenangels.py | 4 ++--
 gallery_dl/extractor/pinterest.py    | 4 ++--
 gallery_dl/extractor/twitter.py      | 4 ++--
 gallery_dl/extractor/wallhaven.py    | 2 +-
 test/test_results.py                 | 3 +--
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py
index 8728ede0..2fb703f7 100644
--- a/gallery_dl/extractor/deviantart.py
+++ b/gallery_dl/extractor/deviantart.py
@@ -238,8 +238,8 @@ class DeviantartFolderExtractor(DeviantartExtractor):
             "keyword": "2c132d1996b2de87949164a6eab5d72b6c824609",
         }),
         ("https://www.deviantart.com/yakuzafc/gallery/37412168/Crafts", {
-            "url": "b6bdaca6bfcedf1c0418c5b5dd19aa1d7fd234db",
-            "keyword": "91624217b8a440e6cd7cc412c475e69b956e0a08",
+            "url": "f7d1f3cde2cdb56ffd02ef5eee0c1d0dcf2e08f1",
+            "keyword": "e7f670d3b021d051dd150eb485df7add5f7d6a02",
             "options": (("original", False),),
         }),
         ("https://shimoda7.deviantart.com/gallery/722019/Miscellaneous", None),
diff --git a/gallery_dl/extractor/fallenangels.py b/gallery_dl/extractor/fallenangels.py
index 62f329b2..b829e4e7 100644
--- a/gallery_dl/extractor/fallenangels.py
+++ b/gallery_dl/extractor/fallenangels.py
@@ -68,8 +68,8 @@ class FallenangelsMangaExtractor(MangaExtractor):
     scheme = "https"
     test = [
         ("http://manga.fascans.com/manga/trinity-seven", {
-            "url": "ea65b3d3c196c46ddd40aa48aa31b434f66cfda5",
-            "keyword": "19aceef2fa111d74a535b7bf00a4f75d08806f90",
+            "url": "1e6527966a6d81184a8f37495756ed0040b2678a",
+            "keyword": "4fa293a5a62906072ee436518d0c15e66816d7ea",
         }),
         ("https://truyen.fascans.com/manga/rakudai-kishi-no-eiyuutan", {
             "url": "51a731a6b82d5eb7a335fbae6b02d06aeb2ab07b",
diff --git a/gallery_dl/extractor/pinterest.py b/gallery_dl/extractor/pinterest.py
index 699948ba..04984c7a 100644
--- a/gallery_dl/extractor/pinterest.py
+++ b/gallery_dl/extractor/pinterest.py
@@ -118,7 +118,7 @@ class PinterestRelatedPinExtractor(PinterestPinExtractor):
     pattern = [BASE_PATTERN + r"/pin/([^/?#&]+).*#related$"]
     test = [
         ("https://www.pinterest.com/pin/858146903966145189/#related", {
-            "range": (1, 50),
+            "range": "1-50",
             "count": 50,
         }),
     ]
@@ -139,7 +139,7 @@ class PinterestRelatedBoardExtractor(PinterestBoardExtractor):
     pattern = [BASE_PATTERN + r"/(?!pin/)([^/?#&]+)/([^/?#&]+).*#related$"]
     test = [
         ("https://www.pinterest.com/g1952849/test-/#related", {
-            "range": (1, 50),
+            "range": "1-50",
             "count": 50,
         }),
     ]
diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py
index 0b352cb2..32879444 100644
--- a/gallery_dl/extractor/twitter.py
+++ b/gallery_dl/extractor/twitter.py
@@ -101,7 +101,7 @@ class TwitterTimelineExtractor(TwitterExtractor):
     pattern = [r"(?:https?://)?(?:www\.|mobile\.)?twitter\.com"
                r"/([^/?&#]+)/?$"]
     test = [("https://twitter.com/PicturesEarth", {
-        "range": (1, 40),
+        "range": "1-40",
         "url": "2f4d51cbba81e56c1c755677b3ad58fc167c9771",
         "keyword": "cbae53b6f4ba133078bb13c95dbd3cbb4fa40b9f",
     })]
@@ -118,7 +118,7 @@ class TwitterMediaExtractor(TwitterExtractor):
     pattern = [r"(?:https?://)?(?:www\.|mobile\.)?twitter\.com"
                r"/([^/?&#]+)/media(?!\w)"]
     test = [("https://twitter.com/PicturesEarth/media", {
-        "range": (1, 40),
+        "range": "1-40",
         "url": "2f4d51cbba81e56c1c755677b3ad58fc167c9771",
     })]
 
diff --git a/gallery_dl/extractor/wallhaven.py b/gallery_dl/extractor/wallhaven.py
index 1c6746eb..e8ee3589 100644
--- a/gallery_dl/extractor/wallhaven.py
+++ b/gallery_dl/extractor/wallhaven.py
@@ -95,7 +95,7 @@ class WallhavenSearchExtractor(WallhavenExtractor):
         (("https://alpha.wallhaven.cc/search?q=id%3A87"
           "&categories=111&purity=100&sorting=relevance&order=desc&page=3"), {
             "url": "1b9b6d97b9670e32ef5dd6942a095549ab543d91",
-            "range": (1, 3),
+            "range": "1-3",
         }),
     ]
     per_page = 24
diff --git a/test/test_results.py b/test/test_results.py
index 3b5c71c7..43373f4d 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -23,7 +23,6 @@ TRAVIS_SKIP = {
 
 # temporary issues, etc.
 BROKEN = {
-    "gelbooru",       # no API results
 }
 
 
@@ -54,7 +53,7 @@ class TestExtractorResults(unittest.TestCase):
                 for key, value in result["options"]:
                     config.set(key.split("."), value)
             if "range" in result:
-                config.set(("_", "image", "range"), (result["range"],))
+                config.set(("image-range",), result["range"])
             content = "content" in result
         else:
             content = False