Test cookies.is_expired separately

2 files changed, 30 insertions, 4 deletions

diff --git a/netlib/http/cookies.py b/netlib/http/cookies.py
index 90789365..dd0af99c 100644
--- a/netlib/http/cookies.py
+++ b/netlib/http/cookies.py
@@ -262,23 +262,28 @@ def refresh_set_cookie_header(c, delta):
         raise ValueError("Invalid Cookie")
     return ret
 
+
 def is_expired(cookie_attrs):
     """
         Determines whether a cookie has expired.
 
         Returns: boolean
     """
-    expired = False
 
     # See if 'expires' time is in the past
+    expires = False
     if 'expires' in cookie_attrs:
         e = email.utils.parsedate_tz(cookie_attrs["expires"])
         if e:
             exp_ts = email.utils.mktime_tz(e)
             now_ts = time.time()
-            expired = exp_ts < now_ts
+            expires = exp_ts < now_ts
 
     # or if Max-Age is 0
-    expired = expired or (int(cookie_attrs.get('Max-Age', 1)) == 0)
+    max_age = False
+    try:
+        max_age = int(cookie_attrs.get('Max-Age', 1)) == 0
+    except ValueError:
+        pass
 
-    return expired
+    return expires or max_age
diff --git a/test/netlib/http/test_cookies.py b/test/netlib/http/test_cookies.py
index 83b85656..17e21b94 100644
--- a/test/netlib/http/test_cookies.py
+++ b/test/netlib/http/test_cookies.py
@@ -245,3 +245,24 @@ def test_refresh_cookie():
     assert cookies.refresh_set_cookie_header(c, 0)
     c = "foo/bar=bla"
     assert cookies.refresh_set_cookie_header(c, 0)
+
+
+def test_is_expired():
+    CA = cookies.CookieAttrs
+
+    # A cookie can be expired
+    # by setting the expire time in the past
+    assert cookies.is_expired(CA([("Expires", "Thu, 01-Jan-1970 00:00:00 GMT")]))
+
+    # or by setting Max-Age to 0
+    assert cookies.is_expired(CA([("Max-Age", "0")]))
+
+    # or both
+    assert cookies.is_expired(CA([("Expires", "Thu, 01-Jan-1970 00:00:00 GMT"), ("Max-Age", "0")]))
+
+    assert not cookies.is_expired(CA([("Expires", "Thu, 24-Aug-2063 00:00:00 GMT")]))
+    assert not cookies.is_expired(CA([("Max-Age", "1")]))
+    assert not cookies.is_expired(CA([("Expires", "Thu, 15-Jul-2068 00:00:00 GMT"), ("Max-Age", "1")]))
+
+    assert not cookies.is_expired(CA([("Max-Age", "nan")]))
+    assert not cookies.is_expired(CA([("Expires", "false")]))