Rev 4801: Fixed as per John's review. in file:///home/vila/src/bzr/bugs/395714-auth-redirect/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Dec 4 11:09:05 GMT 2009
At file:///home/vila/src/bzr/bugs/395714-auth-redirect/
------------------------------------------------------------
revno: 4801
revision-id: v.ladeuil+lp at free.fr-20091204110905-6ddv5u96db7jhm3s
parent: v.ladeuil+lp at free.fr-20091203171157-2lo1a9ej0fx3743b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 395714-auth-redirect
timestamp: Fri 2009-12-04 12:09:05 +0100
message:
Fixed as per John's review.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py 2009-12-03 17:11:57 +0000
+++ b/bzrlib/tests/test_http.py 2009-12-04 11:09:05 +0000
@@ -269,19 +269,19 @@
def test_empty_header(self):
scheme, remainder = self.parse_header('')
- self.assertEquals('', scheme)
+ self.assertEqual('', scheme)
self.assertIs(None, remainder)
def test_negotiate_header(self):
scheme, remainder = self.parse_header('Negotiate')
- self.assertEquals('negotiate', scheme)
+ self.assertEqual('negotiate', scheme)
self.assertIs(None, remainder)
def test_basic_header(self):
scheme, remainder = self.parse_header(
'Basic realm="Thou should not pass"')
- self.assertEquals('basic', scheme)
- self.assertEquals('realm="Thou should not pass"', remainder)
+ self.assertEqual('basic', scheme)
+ self.assertEqual('realm="Thou should not pass"', remainder)
def test_basic_extract_realm(self):
scheme, remainder = self.parse_header(
@@ -289,13 +289,13 @@
_urllib2_wrappers.BasicAuthHandler)
match, realm = self.auth_handler.extract_realm(remainder)
self.assertTrue(match is not None)
- self.assertEquals('Thou should not pass', realm)
+ self.assertEqual('Thou should not pass', realm)
def test_digest_header(self):
scheme, remainder = self.parse_header(
'Digest realm="Thou should not pass"')
- self.assertEquals('digest', scheme)
- self.assertEquals('realm="Thou should not pass"', remainder)
+ self.assertEqual('digest', scheme)
+ self.assertEqual('realm="Thou should not pass"', remainder)
class TestHTTPServer(tests.TestCase):
@@ -393,14 +393,14 @@
def test_url_parsing(self):
f = FakeManager()
url = http.extract_auth('http://example.com', f)
- self.assertEquals('http://example.com', url)
- self.assertEquals(0, len(f.credentials))
+ self.assertEqual('http://example.com', url)
+ self.assertEqual(0, len(f.credentials))
url = http.extract_auth(
'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
- self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
- self.assertEquals(1, len(f.credentials))
- self.assertEquals([None, 'www.bazaar-vcs.org', 'user', 'pass'],
- f.credentials[0])
+ self.assertEqual('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
+ self.assertEqual(1, len(f.credentials))
+ self.assertEqual([None, 'www.bazaar-vcs.org', 'user', 'pass'],
+ f.credentials[0])
class TestHttpTransportUrls(tests.TestCase):
@@ -1422,7 +1422,7 @@
self.new_server.port)
self.old_server.redirections = \
[('(.*)', r'%s/1\1' % (new_prefix), 301),]
- self.assertEquals('redirected once',t._perform(req).read())
+ self.assertEqual('redirected once',t._perform(req).read())
def test_five_redirections(self):
t = self.old_transport
@@ -1439,7 +1439,7 @@
('/4(.*)', r'%s/5\1' % (new_prefix), 301),
('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
]
- self.assertEquals('redirected 5 times',t._perform(req).read())
+ self.assertEqual('redirected 5 times',t._perform(req).read())
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
@@ -1458,8 +1458,8 @@
t = self._transport(self.new_server.get_url())
# We use None for redirected so that we fail if redirected
- self.assertEquals('0123456789',
- transport.do_catching_redirections(
+ self.assertEqual('0123456789',
+ transport.do_catching_redirections(
self.get_a, t, None).read())
def test_one_redirection(self):
@@ -1470,10 +1470,10 @@
dir, file = urlutils.split(exception.target)
return self._transport(dir)
- self.assertEquals('0123456789',
- transport.do_catching_redirections(
+ self.assertEqual('0123456789',
+ transport.do_catching_redirections(
self.get_a, self.old_transport, redirected).read())
- self.assertEquals(1, self.redirections)
+ self.assertEqual(1, self.redirections)
def test_redirection_loop(self):
@@ -1578,8 +1578,8 @@
self.assertEqual('', ui.ui_factory.stdin.readline())
stderr.seek(0)
expected_prompt = self._expected_username_prompt(t._unqualified_scheme)
- self.assertEquals(expected_prompt, stderr.read(len(expected_prompt)))
- self.assertEquals('', stdout.getvalue())
+ self.assertEqual(expected_prompt, stderr.read(len(expected_prompt)))
+ self.assertEqual('', stdout.getvalue())
self._check_password_prompt(t._unqualified_scheme, 'joe',
stderr.readline())
@@ -1600,7 +1600,7 @@
self.assertEqual('', ui.ui_factory.stdin.readline())
self._check_password_prompt(t._unqualified_scheme, 'joe',
stderr.getvalue())
- self.assertEquals('', stdout.getvalue())
+ self.assertEqual('', stdout.getvalue())
# And we shouldn't prompt again for a different request
# against the same transport.
self.assertEqual('contents of b\n',t.get('b').read())
@@ -1616,7 +1616,7 @@
% (scheme.upper(),
user, self.server.host, self.server.port,
self.server.auth_realm)))
- self.assertEquals(expected_prompt, actual_prompt)
+ self.assertEqual(expected_prompt, actual_prompt)
def _expected_username_prompt(self, scheme):
return (self._username_prompt_prefix
@@ -1854,7 +1854,7 @@
'http://www.example.com/foo/subdir')
self.assertIsInstance(r, type(t))
# Both transports share the some connection
- self.assertEquals(t._get_connection(), r._get_connection())
+ self.assertEqual(t._get_connection(), r._get_connection())
def test_redirected_to_self_with_slash(self):
t = self._transport('http://www.example.com/foo')
@@ -1864,7 +1864,7 @@
# Both transports share the some connection (one can argue that we
# should return the exact same transport here, but that seems
# overkill).
- self.assertEquals(t._get_connection(), r._get_connection())
+ self.assertEqual(t._get_connection(), r._get_connection())
def test_redirected_to_host(self):
t = self._transport('http://www.example.com/foo')
@@ -1889,7 +1889,7 @@
r = t._redirected_to('http://www.example.com/foo',
'https://foo.example.com/foo')
self.assertIsInstance(r, type(t))
- self.assertEquals(t._user, r._user)
+ self.assertEqual(t._user, r._user)
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
@@ -2202,13 +2202,14 @@
stderr = tests.StringIOWrapper()
ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
stdout=stdout, stderr=stderr)
- self.assertEquals('redirected once',
- transport.do_catching_redirections(
+ self.assertEqual('redirected once',
+ transport.do_catching_redirections(
self.get_a, self.old_transport, redirected).read())
- self.assertEquals(1, self.redirections)
+ self.assertEqual(1, self.redirections)
# stdin should be empty
self.assertEqual('', ui.ui_factory.stdin.readline())
- self.assertEquals('', stdout.getvalue())
+ # stdout should be empty, stderr will contains the prompts
+ self.assertEqual('', stdout.getvalue())
def test_auth_on_redirected_via_following_redirections(self):
self.new_server.add_user('joe', 'foo')
@@ -2222,9 +2223,10 @@
self.new_server.port)
self.old_server.redirections = [
('(.*)', r'%s/1\1' % (new_prefix), 301),]
- self.assertEquals('redirected once',t._perform(req).read())
+ self.assertEqual('redirected once',t._perform(req).read())
# stdin should be empty
self.assertEqual('', ui.ui_factory.stdin.readline())
- self.assertEquals('', stdout.getvalue())
+ # stdout should be empty, stderr will contains the prompts
+ self.assertEqual('', stdout.getvalue())
More information about the bazaar-commits
mailing list