New upstream version 1.27.0.upstream/1.27.0

1 files changed, 12 insertions, 4 deletions

diff --git a/test/test_downloader.py b/test/test_downloader.py
index 8027af5..9f9fb3b 100644
--- a/test/test_downloader.py
+++ b/test/test_downloader.py
@@ -174,9 +174,17 @@ class TestHTTPDownloader(TestDownloaderBase):
         TestDownloaderBase.setUpClass()
         cls.downloader = downloader.find("http")(cls.job)
 
-        port = 8088
-        cls.address = "http://127.0.0.1:{}".format(port)
-        server = http.server.HTTPServer(("", port), HttpRequestHandler)
+        host = "127.0.0.1"
+        port = 0  # select random not-in-use port
+
+        try:
+            server = http.server.HTTPServer((host, port), HttpRequestHandler)
+        except OSError as exc:
+            raise unittest.SkipTest(
+                "cannot spawn local HTTP server ({})".format(exc))
+
+        host, port = server.server_address
+        cls.address = "http://{}:{}".format(host, port)
         threading.Thread(target=server.serve_forever, daemon=True).start()
 
     def _run_test(self, ext, input, output,
@@ -303,7 +311,7 @@ SAMPLES = {
     ("mp4" , b"????ftypmp4"),
     ("mp4" , b"????ftypavc1"),
     ("mp4" , b"????ftypiso3"),
-    ("mp4" , b"????ftypM4V"),
+    ("m4v" , b"????ftypM4V"),
     ("mov" , b"????ftypqt  "),
     ("webm", b"\x1A\x45\xDF\xA3"),
     ("ogg" , b"OggS"),