add script to generate test mocks, re-enable tests that depend on it

pytube/cipher.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-This module countains all logic necessary to decipher the signature.
+This module contains all logic necessary to decipher the signature.
 
 YouTube's strategy to restrict downloading videos is to send a ciphered version
 of the signature to the client, along with the decryption algorithm obfuscated

pytube/extract.py

@@ -142,7 +142,7 @@ def js_url(html: str, age_restricted: bool = False) -> str:
     Construct the base JavaScript url, which contains the decipher
     "transforms".
 
-    :param str watch_html:
+    :param str html:
         The html contents of the watch page.
     :param bool age_restricted:
         Is video age restricted.

tests/conftest.py

@@ -34,14 +34,14 @@ def load_and_init_from_playback_file(filename):
 @pytest.fixture
 def cipher_signature():
     """Youtube instance initialized with video id 9bZkp7q19f0."""
-    filename = 'yt-video-9bZkp7q19f0-1507588332.json.gz'
+    filename = 'yt-video-9bZkp7q19f0.json.gz'
     return load_and_init_from_playback_file(filename)
 
 
 @pytest.fixture
 def presigned_video():
     """Youtube instance initialized with video id QRS8MkLhQmM."""
-    filename = 'yt-video-QRS8MkLhQmM-1507588031.json.gz'
+    filename = 'yt-video-QRS8MkLhQmM.json.gz'
     return load_and_init_from_playback_file(filename)
 
 

tests/generate_fixture.py

@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+
+from os import path
+import sys
+import json
+
+currentdir = path.dirname(path.realpath(__file__))
+parentdir = path.dirname(currentdir)
+sys.path.append(parentdir)
+
+from pytube import YouTube
+
+yt = YouTube(sys.argv[1], defer_prefetch_init=True)
+yt.prefetch()
+output = {
+    "url": sys.argv[1],
+    "watch_html": yt.watch_html,
+    "video_info": yt.vid_info,
+    "js": yt.js,
+}
+
+outpath = path.join(currentdir, "mocks", "yt-video-" + yt.video_id + ".json")
+print("Writing to: " + outpath)
+with open(outpath, "w") as f:
+    json.dump(output, f)

tests/test_extract.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 """Unit tests for the :module:`extract <extract>` module."""
-import pytest
 from pytube import extract
 
 
@@ -16,7 +15,6 @@ def test_extract_watch_url():
     assert watch_url == 'https://youtube.com/watch?v=9bZkp7q19f0'
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_info_url(cipher_signature):
     video_info_url = extract.video_info_url(
         video_id=cipher_signature.video_id,
@@ -33,7 +31,6 @@ def test_info_url(cipher_signature):
     assert video_info_url == expected
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_js_url(cipher_signature):
     expected = 'https://youtube.com/yts/jsbin/player-vflOdyxa4/en_US/base.js'
     result = extract.js_url(cipher_signature.watch_html)
@@ -44,12 +41,10 @@ def test_age_restricted(age_restricted):
     assert extract.is_age_restricted(age_restricted['watch_html'])
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_non_age_restricted(cipher_signature):
     assert not extract.is_age_restricted(cipher_signature.watch_html)
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_get_vid_desc(cipher_signature):
-    expected = "PSY - DADDY(feat. CL of 2NE1) M/V @ https://youtu.be/FrG4TEcSuRg\nPSY - 나팔바지(NAPAL BAJI) M/V @ https://youtu.be/tF27TNC_4pc\nPSY - 7TH ALBUM '칠집싸이다' on iTunes @ http://smarturl.it/PSY_7THALBUM\nPSY - GANGNAM STYLE(강남스타일) on iTunes @ http://smarturl.it/PsyGangnam\n#PSY #싸이 #GANGNAMSTYLE #강남스타일\nMore about PSY@\nhttp://www.psypark.com/\nhttp://www.youtube.com/officialpsy\nhttp://www.facebook.com/officialpsy\nhttp://twitter.com/psy_oppa\nhttps://www.instagram.com/42psy42\nhttp://iTunes.com/PSY\nhttp://sptfy.com/PSY\nhttp://weibo.com/psyoppa\nhttp://twitter.com/ygent_official"  # noqa
+    expected = "PSY - ‘I LUV IT’ M/V @ https://youtu.be/Xvjnoagk6GU\nPSY - ‘New Face’ M/V @https://youtu.be/OwJPPaEyqhI\nPSY - 8TH ALBUM '4X2=8' on iTunes @\nhttps://smarturl.it/PSY_8thAlbum\nPSY - GANGNAM STYLE(강남스타일) on iTunes @ http://smarturl.it/PsyGangnam\n#PSY #싸이 #GANGNAMSTYLE #강남스타일\nMore about PSY@\nhttp://www.youtube.com/officialpsy\nhttp://www.facebook.com/officialpsy\nhttp://twitter.com/psy_oppa\nhttps://www.instagram.com/42psy42\nhttp://iTunes.com/PSY\nhttp://sptfy.com/PSY\nhttp://weibo.com/psyoppa"  # noqa
     assert extract.get_vid_descr(cipher_signature.watch_html) == expected

tests/test_streams.py

@@ -2,27 +2,23 @@
 import random
 
 from unittest import mock
-import pytest
 
 from pytube import request
 from pytube import Stream
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_filesize(cipher_signature, mocker):
     mocker.patch.object(request, 'get')
     request.get.return_value = {'content-length': '6796391'}
     assert cipher_signature.streams.first().filesize == 6796391
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_default_filename(cipher_signature):
     expected = 'PSY - GANGNAM STYLE(강남스타일) MV.mp4'
     stream = cipher_signature.streams.first()
     assert stream.default_filename == expected
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_title(cipher_signature):
     expected = 'PSY - GANGNAM STYLE(강남스타일) M/V'
     stream = cipher_signature.streams.first()
@@ -39,7 +35,6 @@ def test_title(cipher_signature):
     assert stream.title == expected
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_download(cipher_signature, mocker):
     mocker.patch.object(request, 'get')
     request.get.side_effect = [
@@ -52,19 +47,16 @@ def test_download(cipher_signature, mocker):
         stream.download()
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_progressive_streams_return_includes_audio_track(cipher_signature):
     stream = cipher_signature.streams.filter(progressive=True).first()
     assert stream.includes_audio_track
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_progressive_streams_return_includes_video_track(cipher_signature):
     stream = cipher_signature.streams.filter(progressive=True).first()
     assert stream.includes_video_track
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_on_progress_hook(cipher_signature, mocker):
     callback_fn = mock.MagicMock()
     cipher_signature.register_on_progress_callback(callback_fn)
@@ -85,7 +77,6 @@ def test_on_progress_hook(cipher_signature, mocker):
     assert isinstance(stream, Stream)
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_on_complete_hook(cipher_signature, mocker):
     callback_fn = mock.MagicMock()
     cipher_signature.register_on_complete_callback(callback_fn)
@@ -102,7 +93,6 @@ def test_on_complete_hook(cipher_signature, mocker):
     assert callback_fn.called
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_repr_for_audio_streams(cipher_signature):
     stream = str(cipher_signature.streams.filter(only_audio=True).first())
     expected = (
@@ -112,7 +102,6 @@ def test_repr_for_audio_streams(cipher_signature):
     assert stream == expected
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_repr_for_video_streams(cipher_signature):
     stream = str(cipher_signature.streams.filter(only_video=True).first())
     expected = (
@@ -122,17 +111,15 @@ def test_repr_for_video_streams(cipher_signature):
     assert stream == expected
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_repr_for_progressive_streams(cipher_signature):
     stream = str(cipher_signature.streams.filter(progressive=True).first())
     expected = (
-        '<Stream: itag="22" mime_type="video/mp4" res="720p" '
-        'fps="30fps" vcodec="avc1.64001F" acodec="mp4a.40.2">'
+        '<Stream: itag="18" mime_type="video/mp4" res="360p" '
+        'fps="30fps" vcodec="avc1.42001E" acodec="mp4a.40.2">'
     )
     assert stream == expected
 
 
-@pytest.mark.skip(reason="Regex error")
 def test_repr_for_adaptive_streams(cipher_signature):
     stream = str(cipher_signature.streams.filter(adaptive=True).first())
     expected = (