Extract authentication options handling into a separate function.

tests/rietveld_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for rietveld.py."""
 
 import logging
 import os
 import ssl
@@ skipping 29 matching lines @@
 
 
 class BaseFixture(unittest.TestCase):
   # Override.
   TESTED_CLASS = Exception
 
   def setUp(self):
     super(BaseFixture, self).setUp()
     # Access to a protected member XX of a client class
     # pylint: disable=W0212
-    self.rietveld = self.TESTED_CLASS('url', 'email', 'password')
+    self.rietveld = self.TESTED_CLASS('url', None, 'email')
     self.rietveld._send = self._rietveld_send
     self.requests = []
 
   def tearDown(self):
     self.assertEqual([], self.requests)
     super(BaseFixture, self).tearDown()
 
   def _rietveld_send(self, url, *args, **kwargs):
     self.assertTrue(self.requests, url)
     request = self.requests.pop(0)
@@ skipping 388 matching lines @@
                     **kwargs):
   """Mock upload.py's Send() to raise SSLError"""
   raise ssl.SSLError('The read operation timed out')
 
 
 class DefaultTimeoutTest(auto_stub.TestCase):
   TESTED_CLASS = rietveld.Rietveld
 
   def setUp(self):
     super(DefaultTimeoutTest, self).setUp()
-    self.rietveld = self.TESTED_CLASS('url', 'email', 'password')
+    self.rietveld = self.TESTED_CLASS('url', None, 'email')
     self.mock(self.rietveld.rpc_server, 'Send', MockSend)
     self.sleep_time = 0
 
   def test_timeout_get(self):
     with self.assertRaises(ProbeException) as cm:
       self.rietveld.get('/api/1234')
 
     self.assertIsNotNone(cm.exception.value, 'Rietveld timeout was not set: %s'
                          % traceback.format_exc())
 
@@ skipping 12 matching lines @@
     self.mock(time, 'sleep', self.MockSleep)
     self.sleep_time = 0
     with self.assertRaises(ssl.SSLError):
       self.rietveld.post('/api/1234', [('key', 'data')])
     self.assertNotEqual(self.sleep_time, 0)
 
 if __name__ == '__main__':
   logging.basicConfig(level=[
     logging.ERROR, logging.INFO, logging.DEBUG][min(2, sys.argv.count('-v'))])
   unittest.main()