Merge pull request #573 from ably/http-fallback-host-fix

Fix `TypeError: '>' not supported between instances of 'float' and 'NoneType'` in http

Author: VeskeR

ably/http/http.py

@@ -146,7 +146,8 @@ def get_rest_hosts(self):
         if host is None:
             return hosts
 
-        if time.time() > self.__host_expires:
+        # unstore saved fallback host after fallbackRetryTimeout (RSC15f)
+        if self.__host_expires is not None and time.time() > self.__host_expires:
             self.__host = None
             self.__host_expires = None
             return hosts

test/unit/http_test.py

@@ -0,0 +1,19 @@
+from ably import AblyRest
+
+
+def test_http_get_rest_hosts_works_when_fallback_realtime_host_is_set():
+    ably = AblyRest(token="foo")
+    ably.options.fallback_realtime_host = ably.options.get_rest_hosts()[0]
+    # Should not raise TypeError
+    hosts = ably.http.get_rest_hosts()
+    assert isinstance(hosts, list)
+    assert all(isinstance(host, str) for host in hosts)
+
+
+def test_http_get_rest_hosts_works_when_fallback_realtime_host_is_not_set():
+    ably = AblyRest(token="foo")
+    ably.options.fallback_realtime_host = None
+    # Should not raise TypeError
+    hosts = ably.http.get_rest_hosts()
+    assert isinstance(hosts, list)
+    assert all(isinstance(host, str) for host in hosts)