From 978cb03f810c1144a8bcfe767075dcbc3da88b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Wed, 20 Nov 2019 21:45:48 +0100
Subject: [PATCH] update misc test results

- Livedoor now uses https:// for its image URLs
- Instagram image URLs got simplified
---
 gallery_dl/extractor/3dbooru.py   |  2 +-
 gallery_dl/extractor/instagram.py |  2 +-
 gallery_dl/extractor/livedoor.py  | 13 ++++++-------
 gallery_dl/extractor/senmanga.py  |  2 +-
 test/test_results.py              |  3 +--
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/gallery_dl/extractor/3dbooru.py b/gallery_dl/extractor/3dbooru.py
index febbb516..ac962113 100644
--- a/gallery_dl/extractor/3dbooru.py
+++ b/gallery_dl/extractor/3dbooru.py
@@ -67,7 +67,7 @@ class _3dbooruPopularExtractor(booru.MoebooruPopularMixin, _3dbooruExtractor):
                r"/post/popular_(?P<scale>by_(?:day|week|month)|recent)"
                r"(?:\?(?P<query>[^#]*))?")
     test = ("http://behoimi.org/post/popular_by_month?month=2&year=2013", {
-        "url": "f5a26c624da9a3d1dbc610e4a614bc57df6251c5",
+        "url": "8b1a5c5b7a10f8f5d3d6124d1aabfee0277078cb",
         "count": 20,
     })
 
diff --git a/gallery_dl/extractor/instagram.py b/gallery_dl/extractor/instagram.py
index 4c38dec6..3c5d0267 100644
--- a/gallery_dl/extractor/instagram.py
+++ b/gallery_dl/extractor/instagram.py
@@ -292,7 +292,7 @@ class InstagramImageExtractor(InstagramExtractor):
         # GraphImage
         ("https://www.instagram.com/p/BqvsDleB3lV/", {
             "pattern": r"https://[^/]+\.(cdninstagram\.com|fbcdn\.net)"
-                       r"/vp/[0-9a-f]+/[0-9A-F]+/t51.2885-15/e35"
+                       r"/v(p/[0-9a-f]+/[0-9A-F]+)?/t51.2885-15/e35"
                        r"/44877605_725955034447492_3123079845831750529_n.jpg",
             "keyword": {
                 "date": "type:datetime",
diff --git a/gallery_dl/extractor/livedoor.py b/gallery_dl/extractor/livedoor.py
index c5fbf818..58dd7ba3 100644
--- a/gallery_dl/extractor/livedoor.py
+++ b/gallery_dl/extractor/livedoor.py
@@ -89,7 +89,6 @@ class LivedoorBlogExtractor(LivedoorExtractor):
         ("http://blog.livedoor.jp/zatsu_ke/", {
             "range": "1-50",
             "count": 50,
-            "archive": False,
             "pattern": r"https?://livedoor.blogimg.jp/\w+/imgs/\w/\w/\w+\.\w+",
             "keyword": {
                 "post": {
@@ -132,16 +131,16 @@ class LivedoorPostExtractor(LivedoorExtractor):
     pattern = r"(?:https?://)?blog\.livedoor\.jp/(\w+)/archives/(\d+)"
     test = (
         ("http://blog.livedoor.jp/zatsu_ke/archives/51493859.html", {
-            "url": "8826fe623f19dc868e7538e8519bf8491e92a0a2",
-            "keyword": "83993111d5d0c08d021196802dd36b73f04c7057",
+            "url": "9ca3bbba62722c8155be79ad7fc47be409e4a7a2",
+            "keyword": "1f5b558492e0734f638b760f70bfc0b65c5a97b9",
         }),
         ("http://blog.livedoor.jp/amaumauma/archives/7835811.html", {
-            "url": "fc1d6a9557245b5a27d3a10bf0fa9922ef377215",
-            "keyword": "fd700760c98897c3125328e157972f905fd34aaa",
+            "url": "204bbd6a9db4969c50e0923855aeede04f2e4a62",
+            "keyword": "05821c7141360e6057ef2d382b046f28326a799d",
         }),
         ("http://blog.livedoor.jp/uotapo/archives/1050616939.html", {
-            "url": "3f3581807ec4776e6a67ed7985a22494d4bc4904",
-            "keyword": "9e319413a42e08d32f0dcbe8aa3b452ad41aa906",
+            "url": "4b5ab144b7309eb870d9c08f8853d1abee9946d2",
+            "keyword": "84fbf6e4eef16675013d6333039a7cfcb22c2d50",
         }),
     )
 
diff --git a/gallery_dl/extractor/senmanga.py b/gallery_dl/extractor/senmanga.py
index 736173f3..bde0b5d7 100644
--- a/gallery_dl/extractor/senmanga.py
+++ b/gallery_dl/extractor/senmanga.py
@@ -24,7 +24,7 @@ class SenmangaChapterExtractor(Extractor):
         ("http://raw.senmanga.com/Bokura-wa-Minna-Kawaisou/37A/1", {
             "url": "5f95140ff511d8497e2ec08fa7267c6bb231faec",
             "keyword": "705d941a150765edb33cd2707074bd703a93788c",
-            "content": "0e37b1995708ffc175f2e175d91a518e6948c379",
+            "content": "556a16d5ca3441d7a5807b6b5ac06ec458a3e4ba",
         }),
         ("http://raw.senmanga.com/Love-Lab/2016-03/1", {
             "url": "8347b9f00c14b864dd3c19a1f5ae52adb2ef00de",
diff --git a/test/test_results.py b/test/test_results.py
index 25f2becb..796b80bd 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -29,7 +29,6 @@ BROKEN = {
     "hentaifox",
     "mangapark",
     "pixhost",
-    "yaplog",
 }
 
 
@@ -79,7 +78,7 @@ class TestExtractorResults(unittest.TestCase):
             pass
         except exception.HttpError as exc:
             exc = str(exc)
-            if re.match(r"5\d\d: ", exc) or \
+            if re.match(r"'5\d\d ", exc) or \
                     re.search(r"\bRead timed out\b", exc):
                 self._skipped.append((url, exc))
                 self.skipTest(exc)