From d0efb9ec9a85662fa43f026339821513ac2f039c Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 25 Nov 2013 03:47:32 +0100
Subject: [tests] Remove global_setup function

---
 test/helper.py                 | 4 ----
 test/test_age_restriction.py   | 3 +--
 test/test_download.py          | 2 --
 test/test_playlists.py         | 3 +--
 test/test_subtitles.py         | 3 +--
 test/test_write_annotations.py | 3 +--
 test/test_write_info_json.py   | 3 +--
 test/test_youtube_lists.py     | 3 +--
 test/test_youtube_signature.py | 3 ---
 9 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'test')

diff --git a/test/helper.py b/test/helper.py
index d7bf7a828..b1f421ac5 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -12,10 +12,6 @@ from youtube_dl import YoutubeDL
 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")
diff --git a/test/test_age_restriction.py b/test/test_age_restriction.py
index 506572e9e..c9cdb96cb 100644
--- 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__))))
 
-from test.helper import global_setup, try_rm
-global_setup()
+from test.helper import try_rm
 
 
 from youtube_dl import YoutubeDL
diff --git a/test/test_download.py b/test/test_download.py
index fe7f7b8cb..dd5818dba 100644
--- 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,
-    global_setup,
     try_rm,
     md5,
     report_warning
 )
-global_setup()
 
 
 import hashlib
diff --git a/test/test_playlists.py b/test/test_playlists.py
index 7c67239a4..167801ae2 100644
--- 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__))))
 
-from test.helper import FakeYDL, global_setup
-global_setup()
+from test.helper import FakeYDL
 
 
 from youtube_dl.extractor import (
diff --git a/test/test_subtitles.py b/test/test_subtitles.py
index 06a304879..94a1f771d 100644
--- 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__))))
 
-from test.helper import FakeYDL, global_setup, md5
-global_setup()
+from test.helper import FakeYDL, md5
 
 
 from youtube_dl.extractor import (
diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py
index 35defb895..eac53b285 100644
--- 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__))))
 
-from test.helper import get_params, global_setup, try_rm
-global_setup()
+from test.helper import get_params, try_rm
 
 
 import io
diff --git a/test/test_write_info_json.py b/test/test_write_info_json.py
index 30c4859fd..d7177611b 100644
--- 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__))))
 
-from test.helper import get_params, global_setup
-global_setup()
+from test.helper import get_params
 
 
 import io
diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index 938517a2d..8fd073f31 100644
--- 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__))))
 
-from test.helper import FakeYDL, global_setup
-global_setup()
+from test.helper import FakeYDL
 
 
 from youtube_dl.extractor import (
diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py
index 5e1ff5eb0..056700614 100644
--- 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__))))
 
-from test.helper import global_setup
-global_setup()
-
 
 import io
 import re
-- 
cgit v1.2.3