fix 'range' tests and update a few test results

pull/133/head
Mike Fährmann 6 years ago
parent 392a081657
commit 1532d1b690
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

@ -238,8 +238,8 @@ class DeviantartFolderExtractor(DeviantartExtractor):
"keyword": "2c132d1996b2de87949164a6eab5d72b6c824609", "keyword": "2c132d1996b2de87949164a6eab5d72b6c824609",
}), }),
("https://www.deviantart.com/yakuzafc/gallery/37412168/Crafts", { ("https://www.deviantart.com/yakuzafc/gallery/37412168/Crafts", {
"url": "b6bdaca6bfcedf1c0418c5b5dd19aa1d7fd234db", "url": "f7d1f3cde2cdb56ffd02ef5eee0c1d0dcf2e08f1",
"keyword": "91624217b8a440e6cd7cc412c475e69b956e0a08", "keyword": "e7f670d3b021d051dd150eb485df7add5f7d6a02",
"options": (("original", False),), "options": (("original", False),),
}), }),
("https://shimoda7.deviantart.com/gallery/722019/Miscellaneous", None), ("https://shimoda7.deviantart.com/gallery/722019/Miscellaneous", None),

@ -68,8 +68,8 @@ class FallenangelsMangaExtractor(MangaExtractor):
scheme = "https" scheme = "https"
test = [ test = [
("http://manga.fascans.com/manga/trinity-seven", { ("http://manga.fascans.com/manga/trinity-seven", {
"url": "ea65b3d3c196c46ddd40aa48aa31b434f66cfda5", "url": "1e6527966a6d81184a8f37495756ed0040b2678a",
"keyword": "19aceef2fa111d74a535b7bf00a4f75d08806f90", "keyword": "4fa293a5a62906072ee436518d0c15e66816d7ea",
}), }),
("https://truyen.fascans.com/manga/rakudai-kishi-no-eiyuutan", { ("https://truyen.fascans.com/manga/rakudai-kishi-no-eiyuutan", {
"url": "51a731a6b82d5eb7a335fbae6b02d06aeb2ab07b", "url": "51a731a6b82d5eb7a335fbae6b02d06aeb2ab07b",

@ -118,7 +118,7 @@ class PinterestRelatedPinExtractor(PinterestPinExtractor):
pattern = [BASE_PATTERN + r"/pin/([^/?#&]+).*#related$"] pattern = [BASE_PATTERN + r"/pin/([^/?#&]+).*#related$"]
test = [ test = [
("https://www.pinterest.com/pin/858146903966145189/#related", { ("https://www.pinterest.com/pin/858146903966145189/#related", {
"range": (1, 50), "range": "1-50",
"count": 50, "count": 50,
}), }),
] ]
@ -139,7 +139,7 @@ class PinterestRelatedBoardExtractor(PinterestBoardExtractor):
pattern = [BASE_PATTERN + r"/(?!pin/)([^/?#&]+)/([^/?#&]+).*#related$"] pattern = [BASE_PATTERN + r"/(?!pin/)([^/?#&]+)/([^/?#&]+).*#related$"]
test = [ test = [
("https://www.pinterest.com/g1952849/test-/#related", { ("https://www.pinterest.com/g1952849/test-/#related", {
"range": (1, 50), "range": "1-50",
"count": 50, "count": 50,
}), }),
] ]

@ -101,7 +101,7 @@ class TwitterTimelineExtractor(TwitterExtractor):
pattern = [r"(?:https?://)?(?:www\.|mobile\.)?twitter\.com" pattern = [r"(?:https?://)?(?:www\.|mobile\.)?twitter\.com"
r"/([^/?&#]+)/?$"] r"/([^/?&#]+)/?$"]
test = [("https://twitter.com/PicturesEarth", { test = [("https://twitter.com/PicturesEarth", {
"range": (1, 40), "range": "1-40",
"url": "2f4d51cbba81e56c1c755677b3ad58fc167c9771", "url": "2f4d51cbba81e56c1c755677b3ad58fc167c9771",
"keyword": "cbae53b6f4ba133078bb13c95dbd3cbb4fa40b9f", "keyword": "cbae53b6f4ba133078bb13c95dbd3cbb4fa40b9f",
})] })]
@ -118,7 +118,7 @@ class TwitterMediaExtractor(TwitterExtractor):
pattern = [r"(?:https?://)?(?:www\.|mobile\.)?twitter\.com" pattern = [r"(?:https?://)?(?:www\.|mobile\.)?twitter\.com"
r"/([^/?&#]+)/media(?!\w)"] r"/([^/?&#]+)/media(?!\w)"]
test = [("https://twitter.com/PicturesEarth/media", { test = [("https://twitter.com/PicturesEarth/media", {
"range": (1, 40), "range": "1-40",
"url": "2f4d51cbba81e56c1c755677b3ad58fc167c9771", "url": "2f4d51cbba81e56c1c755677b3ad58fc167c9771",
})] })]

@ -95,7 +95,7 @@ class WallhavenSearchExtractor(WallhavenExtractor):
(("https://alpha.wallhaven.cc/search?q=id%3A87" (("https://alpha.wallhaven.cc/search?q=id%3A87"
"&categories=111&purity=100&sorting=relevance&order=desc&page=3"), { "&categories=111&purity=100&sorting=relevance&order=desc&page=3"), {
"url": "1b9b6d97b9670e32ef5dd6942a095549ab543d91", "url": "1b9b6d97b9670e32ef5dd6942a095549ab543d91",
"range": (1, 3), "range": "1-3",
}), }),
] ]
per_page = 24 per_page = 24

@ -23,7 +23,6 @@ TRAVIS_SKIP = {
# temporary issues, etc. # temporary issues, etc.
BROKEN = { BROKEN = {
"gelbooru", # no API results
} }
@ -54,7 +53,7 @@ class TestExtractorResults(unittest.TestCase):
for key, value in result["options"]: for key, value in result["options"]:
config.set(key.split("."), value) config.set(key.split("."), value)
if "range" in result: if "range" in result:
config.set(("_", "image", "range"), (result["range"],)) config.set(("image-range",), result["range"])
content = "content" in result content = "content" in result
else: else:
content = False content = False

Loading…
Cancel
Save