Do not retry uploading to blobstore on HTTP 500, regenerate a new url first.

tests/isolateserver_archive_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.
 
 import binascii
 import random
 import hashlib
 import logging
 import os
@@ skipping 127 matching lines @@
         {'data': sha1encoded, 'content_type': 'application/octet-stream'},
         StringIO.StringIO('\0'),
       ),
       (
         path + 'content/generate_blobstore_url/default-gzip/%s' % s,
         {'data': [('token', 'foo bar')]},
         StringIO.StringIO('an_url/'),
       ),
       (
         'an_url/',
-        {'data': body, 'content_type': content_type},
+        {'data': body, 'content_type': content_type, 'retry_50x': False},
         StringIO.StringIO('ok'),
       ),
     ]
 
     old_read_and_compress = isolateserver_archive.read_and_compress
     try:
       isolateserver_archive.read_and_compress = lambda x, y: compressed
       result = isolateserver_archive.upload_sha1_tree(
             base_url=path,
             indir=os.getcwd(),
@@ skipping 25 matching lines @@
         self.assertEqual('FakeUrl', url)
         self.assertEqual(self.fail, upload_func)
         actual.extend(items)
 
       isolateserver_archive.update_files_to_upload = process
       isolateserver_archive.process_items('FakeUrl', items, self.fail)
       self.assertEqual(expected, actual)
     finally:
       isolateserver_archive.update_files_to_upload = old
 
+  def test_upload_blobstore_simple(self):
+    content = 'blob_content'
+    s = hashlib.sha1(content).hexdigest()
+    path = 'http://example.com:80/'
+    data = [('token', 'foo bar')]
+    content_type, body = isolateserver_archive.encode_multipart_formdata(
+        data[:], [('content', s, 'blob_content')])
+    self._requests = [
+      (
+        path + 'gen_url?foo#bar',
+        {'data': data[:]},
+        StringIO.StringIO('an_url/'),
+      ),
+      (
+        'an_url/',
+        {'data': body, 'content_type': content_type, 'retry_50x': False},
+        StringIO.StringIO('ok42'),
+      ),
+    ]
+    result = isolateserver_archive.upload_hash_content_to_blobstore(
+        path + 'gen_url?foo#bar', data[:], s, content)
+    self.assertEqual('ok42', result)
+
+  def test_upload_blobstore_retry_500(self):
+    content = 'blob_content'
+    s = hashlib.sha1(content).hexdigest()
+    path = 'http://example.com:80/'
+    data = [('token', 'foo bar')]
+    content_type, body = isolateserver_archive.encode_multipart_formdata(
+        data[:], [('content', s, 'blob_content')])
+    self._requests = [
+      (
+        path + 'gen_url?foo#bar',
+        {'data': data[:]},
+        StringIO.StringIO('an_url/'),
+      ),
+      (
+        'an_url/',
+        {'data': body, 'content_type': content_type, 'retry_50x': False},
+        # Let's say an HTTP 500 was returned.
+        None,
+      ),
+      # In that case, a new url must be generated since the last one may have
+      # been "consumed".
+      (
+        path + 'gen_url?foo#bar',
+        {'data': data[:]},
+        StringIO.StringIO('an_url/'),
+      ),
+      (
+        'an_url/',
+        {'data': body, 'content_type': content_type, 'retry_50x': False},
+        StringIO.StringIO('ok42'),
+      ),
+    ]
+    result = isolateserver_archive.upload_hash_content_to_blobstore(
+        path + 'gen_url?foo#bar', data[:], s, content)
+    self.assertEqual('ok42', result)
+
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=(logging.DEBUG if '-v' in sys.argv else logging.ERROR))
   unittest.main()