Web API: eregs#307 add port 443 as a “hidden” post for retrieving cur…

…rent host.
tadhg-ohiggins · Sep 9, 2016 · d2f10d1 · d2f10d1
1 parent 56066c4
commit d2f10d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/regparser/web/jobs/utils.py b/regparser/web/jobs/utils.py
@@ -107,9 +107,9 @@ def get_host():
     """
     hostname = getattr(settings, "CANONICAL_HOSTNAME", "")
     hostport = getattr(settings, "CANONICAL_PORT", "")
-    if hostport and hostport is not "80":
+    if hostport and hostport not in ("80", "443"):
         hostport = ":%s" % hostport
-    elif hostport is "80":
+    elif hostport in ("80", "443"):
         hostport = ""
     return "%s%s" % (hostname, hostport)
 

diff --git a/tests/test_web_api.py b/tests/test_web_api.py
@@ -331,11 +331,9 @@ def _check(port=None):
     with patch.object(settings, "CANONICAL_PORT", "2323"):
         _check(port=2323)
 
-    with patch.object(settings, "CANONICAL_PORT", "80"):
-        _check()
-
-    with patch.object(settings, "CANONICAL_PORT", ""):
-        _check()
+    for port in ("80", "443", ""):
+        with patch.object(settings, "CANONICAL_PORT", port):
+            _check()
 
     with pytest.raises(ValueError) as err:
         status_url("something", "something-without-a-slash")
@@ -353,10 +351,7 @@ def test_file_url():
         for hx in hexes:
             assert file_url(hx) == "%s:2323%s%s/" % (domain, urlpath, hx)
 
-    with patch.object(settings, "CANONICAL_PORT", "80"):
-        for hx in hexes:
-            assert file_url(hx) == "%s%s%s/" % (domain, urlpath, hx)
-
-    with patch.object(settings, "CANONICAL_PORT", ""):
-        for hx in hexes:
-            assert file_url(hx) == "%s%s%s/" % (domain, urlpath, hx)
+    for port in ("80", "443", ""):
+        with patch.object(settings, "CANONICAL_PORT", port):
+            for hx in hexes:
+                assert file_url(hx) == "%s%s%s/" % (domain, urlpath, hx)