Added a default timeout to rietveld requests.

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 sys
+import traceback
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from testing_support.patches_data import GIT, RAW
 
+from testing_support import auto_stub

[Paweł Hajdan Jr., 2014/02/21 00:49:30]

nit: Please put it in one "block" with "from testing_support.patches_data"
import above.

[Sergey Berezin, 2014/02/21 01:30:56]

Done.

 import patch
 import rietveld
 
 
 def _api(files):
   """Mock a rietveld api request."""
   return rietveld.json.dumps({'files': files})
 
 
 def _file(
@@ skipping 387 matching lines @@
 
   def test_get_patchset_properties(self):
     self.requests = [
       ('/api/1/2', '{}'),
     ]
     expected = {}
     self.assertEqual(expected, self.rietveld.get_patchset_properties(1, 2))
     self.assertEqual(expected, self.rietveld.get_patchset_properties(1, 2))
 
 
+class ProbeException(Exception):
+  """Deep-probe a value."""
+  value = None
+
+  def __init__(self, value):
+    super(ProbeException, self).__init__()
+    self.value = value
+
+
+def MockSend(request_path, payload=None,
+             content_type="application/octet-stream",
+             timeout=None,
+             extra_headers=None,
+             **kwargs):
+  """Mock upload.py's Send() to probe the timeout value"""
+  raise ProbeException(timeout)
+
+
+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.mock(self.rietveld.rpc_server, 'Send', MockSend)
+
+  def test_timeout_get(self):
+    try:
+      self.rietveld.get('/api/1234')
+    except ProbeException as e:

[Paweł Hajdan Jr., 2014/02/21 00:49:30]

Use assertRaises instead. This also allows you to inspect the exception, but
seems more idiomatic. Same below.

[Sergey Berezin, 2014/02/21 01:30:56]

Done.

+      self.assertIsNotNone(e.value, 'Rietveld timeout was not set: %s'
+                           % traceback.format_exc())
+      return
+    self.assertTrue(False, 'This unittest has a bug, we should not get here.')
+
+  def test_timeout_post(self):
+    try:
+      self.rietveld.post('/api/1234', [('key', 'data')])
+    except ProbeException as e:
+      self.assertIsNotNone(e.value, 'Rietveld timeout was not set: %s'
+                           % traceback.format_exc())
+      return
+    self.assertTrue(False, 'This unittest has a bug, we should not get here.')
+
 
 if __name__ == '__main__':
   logging.basicConfig(level=[
     logging.ERROR, logging.INFO, logging.DEBUG][min(2, sys.argv.count('-v'))])
   unittest.main()