diff options
Diffstat (limited to 'test/test_downloader_http.py')
-rw-r--r-- | test/test_downloader_http.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/test/test_downloader_http.py b/test/test_downloader_http.py index 81b7dee..3b65859 100644 --- a/test/test_downloader_http.py +++ b/test/test_downloader_http.py @@ -1,20 +1,21 @@ #!/usr/bin/env python3 -# coding: utf-8 -from __future__ import unicode_literals # Allow direct execution import os -import re import sys import unittest + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +import http.server +import re +import threading + from test.helper import http_server_port, try_rm from hypervideo_dl import YoutubeDL -from hypervideo_dl.compat import compat_http_server from hypervideo_dl.downloader.http import HttpFD from hypervideo_dl.utils import encodeFilename -import threading TEST_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -22,7 +23,7 @@ TEST_DIR = os.path.dirname(os.path.abspath(__file__)) TEST_SIZE = 10 * 1024 -class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler): +class HTTPTestRequestHandler(http.server.BaseHTTPRequestHandler): def log_message(self, format, *args): pass @@ -66,7 +67,7 @@ class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler): assert False -class FakeLogger(object): +class FakeLogger: def debug(self, msg): pass @@ -79,7 +80,7 @@ class FakeLogger(object): class TestHttpFD(unittest.TestCase): def setUp(self): - self.httpd = compat_http_server.HTTPServer( + self.httpd = http.server.HTTPServer( ('127.0.0.1', 0), HTTPTestRequestHandler) self.port = http_server_port(self.httpd) self.server_thread = threading.Thread(target=self.httpd.serve_forever) @@ -94,8 +95,8 @@ class TestHttpFD(unittest.TestCase): try_rm(encodeFilename(filename)) self.assertTrue(downloader.real_download(filename, { 'url': 'http://127.0.0.1:%d/%s' % (self.port, ep), - })) - self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE) + }), ep) + self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE, ep) try_rm(encodeFilename(filename)) def download_all(self, params): |