From a03732e142540e5a7d6cb11de5232f0642beb20d Mon Sep 17 00:00:00 2001 From: Alistair Coles Date: Fri, 12 Sep 2014 10:20:19 +0100 Subject: [PATCH] Add comments to clarify change to www-authenticate test Trivial patch to tidy-up change to the functional test for www-authenticate header and add a comment to explain that multiple header values might be returned. Change-Id: If62cb3fd9e11450a2be0cec71e80ecb74a959d04 Related-bug: 1368048 --- test/functional/tests.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/functional/tests.py b/test/functional/tests.py index b8c8e4c253..d6b0b70f9a 100644 --- a/test/functional/tests.py +++ b/test/functional/tests.py @@ -270,6 +270,8 @@ class TestAccount(Base): containers) def testQuotedWWWAuthenticateHeader(self): + # check that the www-authenticate header value with the swift realm + # is correctly quoted. conn = Connection(tf.config) conn.authenticate() inserted_html = 'Hello World' @@ -279,9 +281,13 @@ class TestAccount(Base): conn.connection.request('GET', '/v1/' + quoted_hax, None, {}) resp = conn.connection.getresponse() resp_headers = dict(resp.getheaders()) - self.assertTrue('www-authenticate' in resp_headers, resp_headers) + self.assertTrue('www-authenticate' in resp_headers, + 'www-authenticate not found in %s' % resp_headers) actual = resp_headers['www-authenticate'] expected = 'Swift realm="%s"' % quoted_hax + # other middleware e.g. auth_token may also set www-authenticate + # headers in which case actual values will be a comma separated list. + # check that expected value is among the actual values self.assertTrue(expected in actual, '%s not found in %s' % (expected, actual))