aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-05-05 20:51:27 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-05-05 20:51:27 +0200
commit02d5eb935f020241ff33b4b91ba88b92eee66b97 (patch)
treefa53a474107c4a2b3b80d45e74ddf376f9dee4d5 /test
parent94ca71b7cce1516f0aaad43083fbb24ebbc91182 (diff)
parent486f0c947675eebb129414f8f46010206c9245b7 (diff)
downloadyoutube-dl-02d5eb935f020241ff33b4b91ba88b92eee66b97.tar.xz
Merge remote-tracking branch 'origin/master'
Conflicts: youtube_dl/InfoExtractors.py
Diffstat (limited to 'test')
-rw-r--r--test/tests.json9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/tests.json b/test/tests.json
index b4d511dd8..66e93a33a 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -411,5 +411,14 @@
"info_dict":{
"title":"Sucked on a toilet"
}
+ },
+ {
+ "name": "Photobucket",
+ "url": "http://media.photobucket.com/user/rachaneronas/media/TiredofLinkBuildingTryBacklinkMyDomaincom_zpsc0c3b9fa.mp4.html?filters[term]=search&filters[primary]=videos&filters[secondary]=images&sort=1&o=0",
+ "file": "zpsc0c3b9fa.mp4",
+ "md5": "7dabfb92b0a31f6c16cebc0f8e60ff99",
+ "info_dict":{
+ "title":"Tired of Link Building? Try BacklinkMyDomain.com!"
+ }
}
]