Improve cookie info message and fix cookie test cases.

This commit is contained in:
Bastian Kleineidam 2011-08-03 21:22:12 +02:00
parent 6b52b28425
commit cdf91a0321
2 changed files with 8 additions and 8 deletions

View file

@ -464,8 +464,8 @@ class HttpUrl (internpaturl.InternPatternUrl, proxysupport.ProxySupport):
# store cookies for valid links
if self.aggregate.config['storecookies']:
for c in self.cookies:
self.add_info(_("Sent cookie: %(cookie)s.") %
{"cookie": c})
self.add_info(_("Sent Cookie: %(cookie)s.") %
{"cookie": c.client_header_value()})
errors = self.aggregate.cookies.add(self.headers,
self.urlparts[0], self.urlparts[1], self.urlparts[2])
if errors:

View file

@ -45,7 +45,7 @@ class TestCookieJar (unittest.TestCase):
value = "; ".join('%s=%s' % (key, value) for key, value in data)
headers = get_headers('Set-Cookie', value)
jar.add(headers, scheme, host, path)
self.assertEqual(len(jar.cache[host]), 1)
self.assertEqual(len(jar.cache), 1)
# add updated cookie
data = (
("FOO", "Baz"),
@ -55,7 +55,7 @@ class TestCookieJar (unittest.TestCase):
value = "; ".join('%s=%s' % (key, value) for key, value in data)
headers = get_headers('Set-Cookie', value)
jar.add(headers, scheme, host, path)
self.assertEqual(len(jar.cache[host]), 1)
self.assertEqual(len(jar.cache), 1)
# remove cookie
data = (
("FOO", "Baz"),
@ -66,7 +66,7 @@ class TestCookieJar (unittest.TestCase):
value = "; ".join('%s=%s' % (key, value) for key, value in data)
headers = get_headers('Set-Cookie', value)
jar.add(headers, scheme, host, path)
self.assertEqual(len(jar.cache[host]), 0)
self.assertEqual(len(jar.cache), 0)
def test_cookie_cache2 (self):
scheme = "http"
@ -81,7 +81,7 @@ class TestCookieJar (unittest.TestCase):
value = "; ".join('%s=%s' % (key, value) for key, value in data)
headers = get_headers('Set-Cookie2', value)
jar.add(headers, scheme, host, path)
self.assertEqual(len(jar.cache[host]), 1)
self.assertEqual(len(jar.cache), 1)
# add updated cookie
data = (
("Foo", "Baz"),
@ -91,7 +91,7 @@ class TestCookieJar (unittest.TestCase):
value = "; ".join('%s=%s' % (key, value) for key, value in data)
headers = get_headers('Set-Cookie2', value)
jar.add(headers, scheme, host, path)
self.assertEqual(len(jar.cache[host]), 1)
self.assertEqual(len(jar.cache), 1)
# remove cookie
data = (
("FOO", "Baz"),
@ -102,4 +102,4 @@ class TestCookieJar (unittest.TestCase):
value = "; ".join('%s=%s' % (key, value) for key, value in data)
headers = get_headers('Set-Cookie2', value)
jar.add(headers, scheme, host, path)
self.assertEqual(len(jar.cache[host]), 0)
self.assertEqual(len(jar.cache), 0)