summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-06-27 20:31:27 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-06-27 20:31:27 +0200
commit0c56a3f773f416aeeb143db5b0ab36701c6c8e64 (patch)
tree83f538731cb7d542a85d01ebd4314a4af24438ed
parent9d069c477895862d93e223b6d8cc475d42746033 (diff)
downloadyoutube-dl-0c56a3f773f416aeeb143db5b0ab36701c6c8e64.tar.gz
youtube-dl-0c56a3f773f416aeeb143db5b0ab36701c6c8e64.tar.xz
youtube-dl-0c56a3f773f416aeeb143db5b0ab36701c6c8e64.zip
[googleplus] move tests
-rw-r--r--test/tests.json10
-rw-r--r--youtube_dl/extractor/googleplus.py11
2 files changed, 11 insertions, 10 deletions
diff --git a/test/tests.json b/test/tests.json
index 4ad976b8a..ce4e7fe08 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -147,16 +147,6 @@
     }
   },
   {
-    "name": "GooglePlus",
-    "url": "https://plus.google.com/u/0/108897254135232129896/posts/ZButuJc6CtH",
-    "file": "ZButuJc6CtH.flv",
-    "info_dict": {
-      "upload_date": "20120613",
-      "uploader": "井上ヨシマサ",
-      "title": "嘆きの天使 降臨"
-    }
-  },
-  {
     "name": "FunnyOrDie",
     "url": "http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version",
     "file": "0732f586d7.mp4",
diff --git a/youtube_dl/extractor/googleplus.py b/youtube_dl/extractor/googleplus.py
index ff2cdeebb..a8f171afd 100644
--- a/youtube_dl/extractor/googleplus.py
+++ b/youtube_dl/extractor/googleplus.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import datetime
 import re
 
@@ -12,6 +14,15 @@ class GooglePlusIE(InfoExtractor):
 
     _VALID_URL = r'(?:https://)?plus\.google\.com/(?:[^/]+/)*?posts/(\w+)'
     IE_NAME = u'plus.google'
+    _TEST = {
+        u"url": u"https://plus.google.com/u/0/108897254135232129896/posts/ZButuJc6CtH",
+        u"file": u"ZButuJc6CtH.flv",
+        u"info_dict": {
+            u"upload_date": u"20120613",
+            u"uploader": u"井上ヨシマサ",
+            u"title": u"嘆きの天使 降臨"
+        }
+    }
 
     def _real_extract(self, url):
         # Extract id from URL