Merge pull request #1860 from gbetous-missingno/fixhttp

HTTPVideo: Allow to specify port in URL

Author: Emantor

labgrid/driver/httpvideodriver.py

@@ -21,9 +21,11 @@ def get_qualities(self):
         return ("high", [("high", None)])
 
     @Driver.check_active
-    def stream(self, quality_hint=None):
+    def stream(self, quality_hint=None, controls=None):
         s = urlsplit(self.video.url)
-        if s.scheme == "http":
+        if s.port:
+            default_port = s.port
+        elif s.scheme == "http":
             default_port = 80
         elif s.scheme == "https":
             default_port = 443

tests/test_httpvideo.py

@@ -2,7 +2,17 @@
 from labgrid.driver.httpvideodriver import HTTPVideoDriver
 
 
-def test_ipvideo_create(target):
+def test_ipvideo_create_http(target):
     r = HTTPVideoStream(target, name=None, url="http://localhost/")
     d = HTTPVideoDriver(target, name=None)
     assert isinstance(d, HTTPVideoDriver)
+
+def test_ipvideo_create_https(target):
+    r = HTTPVideoStream(target, name=None, url="https://localhost/")
+    d = HTTPVideoDriver(target, name=None)
+    assert isinstance(d, HTTPVideoDriver)
+
+def test_ipvideo_create_with_port(target):
+    r = HTTPVideoStream(target, name=None, url="http://localhost:8080/")
+    d = HTTPVideoDriver(target, name=None)
+    assert isinstance(d, HTTPVideoDriver)