projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac05067
)
[tests] Remove global_setup function
author
Philipp Hagemeister
<phihag@phihag.de>
Mon, 25 Nov 2013 02:47:32 +0000
(
03:47
+0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Mon, 25 Nov 2013 02:47:32 +0000
(
03:47
+0100)
test/helper.py
patch
|
blob
|
history
test/test_age_restriction.py
patch
|
blob
|
history
test/test_download.py
patch
|
blob
|
history
test/test_playlists.py
patch
|
blob
|
history
test/test_subtitles.py
patch
|
blob
|
history
test/test_write_annotations.py
patch
|
blob
|
history
test/test_write_info_json.py
patch
|
blob
|
history
test/test_youtube_lists.py
patch
|
blob
|
history
test/test_youtube_signature.py
patch
|
blob
|
history
diff --git
a/test/helper.py
b/test/helper.py
index d7bf7a82802e58f0a80d788de83146d3a9d3fadf..b1f421ac58331bad23328502f42a0e1316df853d 100644
(file)
--- a/
test/helper.py
+++ b/
test/helper.py
@@
-12,10
+12,6
@@
from youtube_dl import YoutubeDL
from youtube_dl.utils import preferredencoding
from youtube_dl.utils import preferredencoding
-def global_setup():
- youtube_dl._setup_opener(timeout=10)
-
-
def get_params(override=None):
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
"parameters.json")
def get_params(override=None):
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
"parameters.json")
diff --git
a/test/test_age_restriction.py
b/test/test_age_restriction.py
index 506572e9ee9604973f7ba31951a8cb32155f1fa3..c9cdb96cb30578d58724ddadb4328ad790316a39 100644
(file)
--- a/
test/test_age_restriction.py
+++ b/
test/test_age_restriction.py
@@
-6,8
+6,7
@@
import sys
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from test.helper import global_setup, try_rm
-global_setup()
+from test.helper import try_rm
from youtube_dl import YoutubeDL
from youtube_dl import YoutubeDL
diff --git
a/test/test_download.py
b/test/test_download.py
index fe7f7b8cb5bb35406f5f1c361c65d18789fd841d..dd5818dba91c166936e45f1c7d8779c752fa3b86 100644
(file)
--- a/
test/test_download.py
+++ b/
test/test_download.py
@@
-9,12
+9,10
@@
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
from test.helper import (
get_params,
get_testcases,
from test.helper import (
get_params,
get_testcases,
- global_setup,
try_rm,
md5,
report_warning
)
try_rm,
md5,
report_warning
)
-global_setup()
import hashlib
import hashlib
diff --git
a/test/test_playlists.py
b/test/test_playlists.py
index 7c67239a438917fd6e64af152cb63c124ff6721c..167801ae246087aae4c7068cb11b84245e560649 100644
(file)
--- a/
test/test_playlists.py
+++ b/
test/test_playlists.py
@@
-8,8
+8,7
@@
import sys
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from test.helper import FakeYDL, global_setup
-global_setup()
+from test.helper import FakeYDL
from youtube_dl.extractor import (
from youtube_dl.extractor import (
diff --git
a/test/test_subtitles.py
b/test/test_subtitles.py
index 06a304879d122b743f62703f08cdcf00301b0d39..94a1f771d19df85063365cdcb47d5799a55f57e1 100644
(file)
--- a/
test/test_subtitles.py
+++ b/
test/test_subtitles.py
@@
-6,8
+6,7
@@
import sys
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from test.helper import FakeYDL, global_setup, md5
-global_setup()
+from test.helper import FakeYDL, md5
from youtube_dl.extractor import (
from youtube_dl.extractor import (
diff --git
a/test/test_write_annotations.py
b/test/test_write_annotations.py
index 35defb8953402a74ff71b7a9a14cec105a5f1703..eac53b285ab6740b368f278784aced9625abb9a6 100644
(file)
--- a/
test/test_write_annotations.py
+++ b/
test/test_write_annotations.py
@@
-7,8
+7,7
@@
import sys
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from test.helper import get_params, global_setup, try_rm
-global_setup()
+from test.helper import get_params, try_rm
import io
import io
diff --git
a/test/test_write_info_json.py
b/test/test_write_info_json.py
index 30c4859fdaad3165aad7fcadc6d359d967edbae4..d7177611b5e1a90aa3bdf612ae873336ff44d686 100644
(file)
--- a/
test/test_write_info_json.py
+++ b/
test/test_write_info_json.py
@@
-7,8
+7,7
@@
import sys
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from test.helper import get_params, global_setup
-global_setup()
+from test.helper import get_params
import io
import io
diff --git
a/test/test_youtube_lists.py
b/test/test_youtube_lists.py
index 938517a2de02c1d81f88f5ca64efbc13e53b54fa..8fd073f3144b0c3f39cd1d3d9dbd518a540773c3 100644
(file)
--- a/
test/test_youtube_lists.py
+++ b/
test/test_youtube_lists.py
@@
-6,8
+6,7
@@
import sys
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from test.helper import FakeYDL, global_setup
-global_setup()
+from test.helper import FakeYDL
from youtube_dl.extractor import (
from youtube_dl.extractor import (
diff --git
a/test/test_youtube_signature.py
b/test/test_youtube_signature.py
index 5e1ff5eb0ede5bcb020cd027ca00d5b4159f9812..056700614b43fa0a3dbceeb82ef991e34fdb53f9 100644
(file)
--- a/
test/test_youtube_signature.py
+++ b/
test/test_youtube_signature.py
@@
-6,9
+6,6
@@
import sys
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from test.helper import global_setup
-global_setup()
-
import io
import re
import io
import re