Update upstream source from tag 'upstream/2020.06.16'

[youtubedl] / test / test_downloader_http.py

diff --git a/test/test_downloader_http.py b/test/test_downloader_http.py
index 5cf2bf1a56212ed1888ee5cb8728c68b01d555fa..7504722810b4e706f6b1143c7a36208ee0478749 100644 (file)
--- a/test/test_downloader_http.py
+++ b/test/test_downloader_http.py
@@ -9,26 +9,16 @@ 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 try_rm
+from test.helper import http_server_port, try_rm

 from youtube_dl import YoutubeDL
 from youtube_dl.compat import compat_http_server
 from youtube_dl.downloader.http import HttpFD
 from youtube_dl.utils import encodeFilename
 from youtube_dl import YoutubeDL
 from youtube_dl.compat import compat_http_server
 from youtube_dl.downloader.http import HttpFD
 from youtube_dl.utils import encodeFilename

-import ssl

 import threading
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 import threading
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
 

-def http_server_port(httpd):
-    if os.name == 'java' and isinstance(httpd.socket, ssl.SSLSocket):
-        # In Jython SSLSocket is not a subclass of socket.socket
-        sock = httpd.socket.sock
-    else:
-        sock = httpd.socket
-    return sock.getsockname()[1]
-
-

 TEST_SIZE = 10 * 1024
 
 
 TEST_SIZE = 10 * 1024